aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2009-06-17 12:35:24 -0400
committerTony Luck <tony.luck@intel.com>2009-06-17 12:35:24 -0400
commit27f70c3117194f98beb009dc48bb2aa267f505bf (patch)
tree22afa3fb31376da9e37f09a78745afe3f16fde8a /drivers/char
parentd186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff)
parente088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff)
Pull for-2.6.31 into release
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/hp-agp.c5
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)
518 if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) 518 if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa))
519 return AE_OK; 519 return AE_OK;
520 520
521 printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n", 521 printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset "
522 (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); 522 "(ioc=%llx, lba=%llx)\n", (char *)context,
523 sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa);
523 524
524 hp_zx1_gart_found = 1; 525 hp_zx1_gart_found = 1;
525 return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */ 526 return AE_CTRL_TERMINATE; /* we only support one bridge; quit looking */