diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-17 16:14:01 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-17 16:14:01 +0000 |
| commit | 94bd217e2d683719ab21a4ac117d8a1b91cbedc9 (patch) | |
| tree | f2d506818cc1643ca816f609518ab5d1cdb28e66 /drivers/video/via/viafbdev.c | |
| parent | 5dd72f12df00cbabc16de770b79b17ced63138be (diff) | |
| parent | 93ee7a9340d64f20295aacc3fb6a22b759323280 (diff) | |
Merge commit 'v3.1-rc2' into HEAD
Diffstat (limited to 'drivers/video/via/viafbdev.c')
| -rw-r--r-- | drivers/video/via/viafbdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 38567849a9d6..a1c4a39485f9 100644 --- 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) |