diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-11-06 23:35:35 -0800 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-08 13:43:54 -0800 |
| commit | 49ebd7c6bb1f70a6c5465925e6ca2f4a32d6a6cd (patch) | |
| tree | 02d6b71c44b108a7123fe812cbf8582914c03a73 /drivers/char | |
| parent | 88d51967f56f55a45849efe50858ea7dfa0d38dc (diff) | |
| download | op-kernel-dev-49ebd7c6bb1f70a6c5465925e6ca2f4a32d6a6cd.zip op-kernel-dev-49ebd7c6bb1f70a6c5465925e6ca2f4a32d6a6cd.tar.gz | |
[PATCH] i460-agp warning fixes
drivers/char/agp/i460-agp.c: In function `i460_fetch_size':
drivers/char/agp/i460-agp.c:115: warning: size_t format, long unsigned int arg (arg 2)
drivers/char/agp/i460-agp.c:115: warning: size_t format, long unsigned int arg (arg 3)
drivers/char/agp/i460-agp.c: In function `i460_mask_memory':
drivers/char/agp/i460-agp.c:542: warning: integer constant is too large for "long" type
Note that the i460_mask_memory() change is a guess. But a good one, I suspect.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/i460-agp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c index be2e569..34a4446 100644 --- a/drivers/char/agp/i460-agp.c +++ b/drivers/char/agp/i460-agp.c @@ -111,8 +111,10 @@ static int i460_fetch_size (void) if (i460.io_page_shift != I460_IO_PAGE_SHIFT) { printk(KERN_ERR PFX - "I/O (GART) page-size %ZuKB doesn't match expected size %ZuKB\n", - 1UL << (i460.io_page_shift - 10), 1UL << (I460_IO_PAGE_SHIFT)); + "I/O (GART) page-size %luKB doesn't match expected " + "size %luKB\n", + 1UL << (i460.io_page_shift - 10), + 1UL << (I460_IO_PAGE_SHIFT)); return 0; } @@ -539,7 +541,7 @@ static unsigned long i460_mask_memory (struct agp_bridge_data *bridge, { /* Make sure the returned address is a valid GATT entry */ return bridge->driver->masks[0].mask - | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xffffff000) >> 12); + | (((addr & ~((1 << I460_IO_PAGE_SHIFT) - 1)) & 0xfffff000) >> 12); } struct agp_bridge_driver intel_i460_driver = { |
