diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 09:35:24 -0700 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /drivers | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
| download | blackbird-op-linux-27f70c3117194f98beb009dc48bb2aa267f505bf.tar.gz blackbird-op-linux-27f70c3117194f98beb009dc48bb2aa267f505bf.zip | |
Pull for-2.6.31 into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 5 | ||||
| -rw-r--r-- | drivers/firmware/pcdp.c | 4 |
2 files changed, 5 insertions, 4 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 */ diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c index 58e9f8e457f8..51e0e2d8fac6 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c @@ -28,10 +28,10 @@ setup_serial_console(struct pcdp_uart *uart) char parity; mmio = (uart->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY); - p += sprintf(p, "uart8250,%s,0x%lx", + p += sprintf(p, "uart8250,%s,0x%llx", mmio ? "mmio" : "io", uart->addr.address); if (uart->baud) { - p += sprintf(p, ",%lu", uart->baud); + p += sprintf(p, ",%llu", uart->baud); if (uart->bits) { switch (uart->parity) { case 0x2: parity = 'e'; break; |
