Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258857
b: refs/heads/master
c: 0acd33d
h: refs/heads/master
i:
  258855: 29f04b6
v: v3
  • Loading branch information
Nikanth Karthikesan authored and Jiri Kosina committed Jun 27, 2011
1 parent 7931724 commit 8ffd18e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d5b55a8f79f77158334e2eff82ffb0eea74618f2
refs/heads/master: 0acd33d08988cef238619f99ba056be16aab443e
4 changes: 2 additions & 2 deletions trunk/drivers/video/via/viafbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2016,7 +2016,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. */
Expand All @@ -2039,7 +2039,7 @@ int __init viafb_init(void)
printk(KERN_INFO
"VIA Graphics Integration Chipset framebuffer %d.%d initializing\n",
VERSION_MAJOR, VERSION_MINOR);
return 0;
return r;
}

void __exit viafb_exit(void)
Expand Down

0 comments on commit 8ffd18e

Please sign in to comment.