Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / firmware / pcdp.c

diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
index 58e9f8e457f833671813c4b71a20b252775efb4d..51e0e2d8fac6345859e1c7083c7a3c86a9b5add3 100644 (file)
--- 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;