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 02:07:12 -0700 |
| commit | 328f55baaea4cab82aad0b6724c84b9b55c1f4ae (patch) | |
| tree | 0c41a5fcb15a21ac039c9a0b96e4a5c3447af219 /drivers/staging/xgifb | |
| parent | b6c78757f9997128c934fc50f4f11031b2101ea6 (diff) | |
| download | op-kernel-dev-328f55baaea4cab82aad0b6724c84b9b55c1f4ae.zip op-kernel-dev-328f55baaea4cab82aad0b6724c84b9b55c1f4ae.tar.gz | |
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')
| -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 bd863a0..dc608ed 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) } -#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); } |
