From f28c4458b551784be5d77ef0661849acb1629b8e Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 29 Aug 2011 23:14:21 +0300 Subject: [PATCH] --- yaml --- r: 268087 b: refs/heads/master c: 79bea04cc963c018eb39e85776c1d2b30f9d2f68 h: refs/heads/master i: 268085: 47c2f9db23f181ba2159c3ad8c25471bbb8b0bdc 268083: 099278b04b07f554f24fe7ab2ef0b99d4daeb65f 268079: e0714470d95fc651768eb86e399262556e8ecfbc v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dd7acfb967c9..a9ad4b511fc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87c8b8b3466b7e5977701b59dc92a1b9537a46e0 +refs/heads/master: 79bea04cc963c018eb39e85776c1d2b30f9d2f68 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 442774508d2a..2a5227290bfb 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -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) @@ -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; }