diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 18:35:24 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 18:35:24 +0200 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /drivers/char | |
| parent | [IA64] Fix build error in paravirt_patchlist.c (diff) | |
| parent | [IA64] Convert ia64 to use int-ll64.h (diff) | |
| download | linux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.xz linux-27f70c3117194f98beb009dc48bb2aa267f505bf.zip | |
Pull for-2.6.31 into release
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 183ac3fe44fb..9c7e2343c399 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c @@ -518,8 +518,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret) if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) return AE_OK; - printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n", - (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); + printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset " + "(ioc=%llx, lba=%llx)\n", (char *)context, + sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); hp_zx1_gart_found = 1; return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */ |