Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268087
b: refs/heads/master
c: 79bea04
h: refs/heads/master
i:
  268085: 47c2f9d
  268083: 099278b
  268079: e071447
v: v3
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 20b2e55 commit f28c445
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: 87c8b8b3466b7e5977701b59dc92a1b9537a46e0
refs/heads/master: 79bea04cc963c018eb39e85776c1d2b30f9d2f68
7 changes: 2 additions & 5 deletions trunk/drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -1939,11 +1939,11 @@ static int __init XGIfb_setup(char *options)

xgi_video_info.refresh_rate = 0;

printk(KERN_INFO "XGIfb: Options %s\n", options);

if (!options || !*options)
return 0;

pr_info("xgifb: options: %s\n", options);

while ((this_opt = strsep(&options, ",")) != NULL) {

if (!*this_opt)
Expand Down Expand Up @@ -1984,11 +1984,8 @@ static int __init XGIfb_setup(char *options)
this_opt + 7, NULL, 0);
} else {
XGIfb_search_mode(this_opt);
/* printk(KERN_INFO "XGIfb: Invalid option %s\n",
this_opt); */
}
}
printk("\nxgifb: outa xgifb_setup 3450");
return 0;
}

Expand Down

0 comments on commit f28c445

Please sign in to comment.