Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / android / ram_console.c

diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c
index 643ac5ce381d9baa4c1321478391a76d83383787..3375c1cce2b35871bcd9f66ae5cee9699689be70 100644 (file)
--- a/drivers/staging/android/ram_console.c
+++ b/drivers/staging/android/ram_console.c
@@ -225,7 +225,7 @@ static int __init ram_console_init(struct ram_console_buffer *buffer,
                buffer_size - sizeof(struct ram_console_buffer);
 
        if (ram_console_buffer_size > buffer_size) {
-               pr_err("ram_console: buffer %p, invalid size %d, datasize %d\n",
+               pr_err("ram_console: buffer %p, invalid size %zu, datasize %zu\n",
                       buffer, buffer_size, ram_console_buffer_size);
                return 0;
        }
@@ -235,8 +235,8 @@ static int __init ram_console_init(struct ram_console_buffer *buffer,
                                                ECC_BLOCK_SIZE) + 1) * ECC_SIZE;
 
        if (ram_console_buffer_size > buffer_size) {
-               pr_err("ram_console: buffer %p, invalid size %d, "
-                      "non-ecc datasize %d\n",
+               pr_err("ram_console: buffer %p, invalid size %zu, "
+                      "non-ecc datasize %zu\n",
                       buffer, buffer_size, ram_console_buffer_size);
                return 0;
        }
@@ -322,7 +322,7 @@ static int ram_console_driver_probe(struct platform_device *pdev)
        }
        buffer_size = res->end - res->start + 1;
        start = res->start;
-       printk(KERN_INFO "ram_console: got buffer at %x, size %x\n",
+       printk(KERN_INFO "ram_console: got buffer at %zx, size %zx\n",
               start, buffer_size);
        buffer = ioremap(res->start, buffer_size);
        if (buffer == NULL) {