aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-16 11:54:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-16 11:54:13 -0700
commit0d0fc3a2d6901bdedd8497acdb3358e2da9abefc (patch)
tree6c8a85670c48cb4bd0b95eefcb11a020436f2ff1 /drivers
parent06168d8a10ceccced51380d683245b33474d428a (diff)
parent20305e59724381365096b6ab0a48054723367c80 (diff)
downloadkernel_samsung_smdk4412-0d0fc3a2d6901bdedd8497acdb3358e2da9abefc.zip
kernel_samsung_smdk4412-0d0fc3a2d6901bdedd8497acdb3358e2da9abefc.tar.gz
kernel_samsung_smdk4412-0d0fc3a2d6901bdedd8497acdb3358e2da9abefc.tar.bz2
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/agp/hp-agp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c
index 99762b6..de5d6d2 100644
--- a/drivers/char/agp/hp-agp.c
+++ b/drivers/char/agp/hp-agp.c
@@ -252,7 +252,7 @@ hp_zx1_configure (void)
readl(hp->ioc_regs+HP_ZX1_PDIR_BASE);
writel(hp->io_tlb_ps, hp->ioc_regs+HP_ZX1_TCNFG);
readl(hp->ioc_regs+HP_ZX1_TCNFG);
- writel(~(HP_ZX1_IOVA_SIZE-1), hp->ioc_regs+HP_ZX1_IMASK);
+ writel((unsigned int)(~(HP_ZX1_IOVA_SIZE-1)), hp->ioc_regs+HP_ZX1_IMASK);
readl(hp->ioc_regs+HP_ZX1_IMASK);
writel(hp->iova_base|1, hp->ioc_regs+HP_ZX1_IBASE);
readl(hp->ioc_regs+HP_ZX1_IBASE);