Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[mv-sheeva.git] / arch / powerpc / kernel / nvram_64.c

diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index ad461e735aec027b17e5004f04421228a1410ed9..9cf197f01e943f1ffb95ad441436e5ee6486ded3 100644 (file)
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -338,8 +338,8 @@ static int __init nvram_create_os_partition(void)
 
        rc = nvram_write_header(new_part);
        if (rc <= 0) {
-               printk(KERN_ERR "nvram_create_os_partition: nvram_write_header \
-                               failed (%d)\n", rc);
+               printk(KERN_ERR "nvram_create_os_partition: nvram_write_header "
+                               "failed (%d)\n", rc);
                return rc;
        }
 
@@ -349,7 +349,7 @@ static int __init nvram_create_os_partition(void)
        rc = ppc_md.nvram_write((char *)&seq_init, sizeof(seq_init), &tmp_index);
        if (rc <= 0) {
                printk(KERN_ERR "nvram_create_os_partition: nvram_write "
-                               "failed (%d)\n", rc);
+                      "failed (%d)\n", rc);
                return rc;
        }