From: Javier Martinez Canillas <martinez.javier@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>,
Bill Pemberton <wfp5p@virginia.edu>,
Randy Dunlap <randy.dunlap@oracle.com>,
Arnaud Patard <apatard@mandriva.com>,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
Huang Weiyi <weiyi.huang@gmail.com>
Subject: [PATCH 2/4] staging: xgifb: Add compilation conditionals
Date: Sat, 04 Sep 2010 19:07:48 -0400 [thread overview]
Message-ID: <1283641668.9641.5.camel@lenovo> (raw)
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
drivers/staging/xgifb/XGI_main.h | 2 ++
drivers/staging/xgifb/XGI_main_26.c | 6 ++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 72448e8..93837f3 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -345,7 +345,9 @@ static int XGIfb_userom = 0;
static int XGIfb_registered;
static int XGIfb_tvmode = 0;
static int XGIfb_mem = 0;
+#ifndef MODULE
static int XGIfb_pdc = 0;
+#endif
static int enable_dstn = 0;
static int XGIfb_ypan = -1;
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 3c80191..2cba4c4 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -843,6 +843,7 @@ static int XGIfb_validate_mode(int myindex)
}
+#ifndef MODULE
static void XGIfb_search_crt2type(const char *name)
{
int i = 0;
@@ -861,7 +862,9 @@ static void XGIfb_search_crt2type(const char *name)
if(XGIfb_crt2type < 0)
printk(KERN_INFO "XGIfb: Invalid CRT2 type: %s\n", name);
}
+#endif
+#ifndef MODULE
static void XGIfb_search_queuemode(const char *name)
{
int i = 0;
@@ -879,6 +882,7 @@ static void XGIfb_search_queuemode(const char *name)
if (XGIfb_queuemode < 0)
printk(KERN_INFO "XGIfb: Invalid queuemode type: %s\n", name);
}
+#endif
static u8 XGIfb_search_refresh_rate(unsigned int rate)
{
@@ -926,6 +930,7 @@ static u8 XGIfb_search_refresh_rate(unsigned int rate)
}
}
+#ifndef MODULE
static void XGIfb_search_tvstd(const char *name)
{
int i = 0;
@@ -941,6 +946,7 @@ static void XGIfb_search_tvstd(const char *name)
i++;
}
}
+#endif
static unsigned char XGIfb_bridgeisslave(void)
{
--
1.7.0.4
next reply other threads:[~2010-09-04 23:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-04 23:07 Javier Martinez Canillas [this message]
2010-09-05 6:24 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283641668.9641.5.camel@lenovo \
--to=martinez.javier@gmail.com \
--cc=apatard@mandriva.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=weiyi.huang@gmail.com \
--cc=wfp5p@virginia.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome