diff options
author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2010-09-08 00:07:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-08 05:07:12 -0400 |
commit | 328f55baaea4cab82aad0b6724c84b9b55c1f4ae (patch) | |
tree | 0c41a5fcb15a21ac039c9a0b96e4a5c3447af219 /drivers/staging/xgifb/XGI_main_26.c | |
parent | b6c78757f9997128c934fc50f4f11031b2101ea6 (diff) |
staging : xgifb: Removes compilation conditionals
This patch fixes a compilation warning in today linux-next
removing some compilation conditionals.
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
-rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index bd863a0b881..dc608ed5a6c 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c | |||
@@ -2797,7 +2797,6 @@ static void XGIfb_post_setmode(void) | |||
2797 | 2797 | ||
2798 | } | 2798 | } |
2799 | 2799 | ||
2800 | #ifndef MODULE | ||
2801 | XGIINITSTATIC int __init XGIfb_setup(char *options) | 2800 | XGIINITSTATIC int __init XGIfb_setup(char *options) |
2802 | { | 2801 | { |
2803 | char *this_opt; | 2802 | char *this_opt; |
@@ -2880,7 +2879,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) | |||
2880 | printk("\nxgifb: outa xgifb_setup 3450"); | 2879 | printk("\nxgifb: outa xgifb_setup 3450"); |
2881 | return 0; | 2880 | return 0; |
2882 | } | 2881 | } |
2883 | #endif | ||
2884 | 2882 | ||
2885 | static unsigned char VBIOS_BUF[65535]; | 2883 | static unsigned char VBIOS_BUF[65535]; |
2886 | 2884 | ||
@@ -3461,13 +3459,12 @@ static struct pci_driver xgifb_driver = { | |||
3461 | 3459 | ||
3462 | XGIINITSTATIC int __init xgifb_init(void) | 3460 | XGIINITSTATIC int __init xgifb_init(void) |
3463 | { | 3461 | { |
3464 | #ifndef MODULE | ||
3465 | char *option = NULL; | 3462 | char *option = NULL; |
3466 | 3463 | ||
3467 | if (fb_get_options("xgifb", &option)) | 3464 | if (fb_get_options("xgifb", &option)) |
3468 | return -ENODEV; | 3465 | return -ENODEV; |
3469 | XGIfb_setup(option); | 3466 | XGIfb_setup(option); |
3470 | #endif | 3467 | |
3471 | return pci_register_driver(&xgifb_driver); | 3468 | return pci_register_driver(&xgifb_driver); |
3472 | } | 3469 | } |
3473 | 3470 | ||