Merge commit 'v3.1-rc2' into HEAD

[pandora-kernel.git] / drivers / video / via / viafbdev.c

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 3856784..a1c4a39 100644 (file)
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2012,7 +2012,7 @@ static int __init viafb_setup(void)
 int __init viafb_init(void)
 {
        u32 dummy_x, dummy_y;
-       int r;
+       int r = 0;
 
        if (machine_is_olpc())
                /* Apply XO-1.5-specific configuration. */
@@ -2033,9 +2033,9 @@ int __init viafb_init(void)
                return -EINVAL;
 
        printk(KERN_INFO
-       "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n",
+       "VIA Graphics Integration Chipset framebuffer %d.%d initializing\n",
               VERSION_MAJOR, VERSION_MINOR);
-       return 0;
+       return r;
 }
 
 void __exit viafb_exit(void)