Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / firmware / broadcom / bcm47xx_nvram.c

diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
index 77eb746..da04fda 100644 (file)
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c
+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
@@ -96,7 +96,7 @@ found:
                nvram_len = size;
        }
        if (nvram_len >= NVRAM_SPACE) {
-               pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
+               pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
                       nvram_len, NVRAM_SPACE - 1);
                nvram_len = NVRAM_SPACE - 1;
        }
@@ -148,8 +148,8 @@ static int nvram_init(void)
            header.len > sizeof(header)) {
                nvram_len = header.len;
                if (nvram_len >= NVRAM_SPACE) {
-                       pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-                               header.len, NVRAM_SPACE);
+                       pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
+                               nvram_len, NVRAM_SPACE);
                        nvram_len = NVRAM_SPACE - 1;
                }