From 9fd39e73f1cb223f02b1ebeb729d55222d14910f Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 8 Sep 2010 00:07:57 -0400 Subject: [PATCH] --- yaml --- r: 219793 b: refs/heads/master c: 328f55baaea4cab82aad0b6724c84b9b55c1f4ae h: refs/heads/master i: 219791: c1d30ca3b93a627122ba3b92811d3a341fe89953 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 01fdfcf4313e..0833c7832d64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6c78757f9997128c934fc50f4f11031b2101ea6 +refs/heads/master: 328f55baaea4cab82aad0b6724c84b9b55c1f4ae diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index bd863a0b881d..dc608ed5a6cf 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2797,7 +2797,6 @@ static void XGIfb_post_setmode(void) } -#ifndef MODULE XGIINITSTATIC int __init XGIfb_setup(char *options) { char *this_opt; @@ -2880,7 +2879,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) printk("\nxgifb: outa xgifb_setup 3450"); return 0; } -#endif static unsigned char VBIOS_BUF[65535]; @@ -3461,13 +3459,12 @@ static struct pci_driver xgifb_driver = { XGIINITSTATIC int __init xgifb_init(void) { -#ifndef MODULE char *option = NULL; if (fb_get_options("xgifb", &option)) return -ENODEV; XGIfb_setup(option); -#endif + return pci_register_driver(&xgifb_driver); }