From: Javier Martinez Canillas <martinez.javier@gmail.com>
Date: Wed, 8 Sep 2010 04:07:57 +0000 (-0400)
Subject: staging : xgifb: Removes compilation conditionals
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=328f55baaea4cab82aad0b6724c84b9b55c1f4ae;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index bd863a0b881d..dc608ed5a6cf 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);
 }