diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 20:54:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-16 20:54:13 +0200 |
| commit | 0d0fc3a2d6901bdedd8497acdb3358e2da9abefc (patch) | |
| tree | 6c8a85670c48cb4bd0b95eefcb11a020436f2ff1 /drivers/char | |
| parent | [PATCH] cleanup whitespace in pci_ids.h (diff) | |
| parent | [IA64] mca_drv cleanup (diff) | |
| download | linux-0d0fc3a2d6901bdedd8497acdb3358e2da9abefc.tar.xz linux-0d0fc3a2d6901bdedd8497acdb3358e2da9abefc.zip | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 99762b6c19ae..de5d6d212674 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); |