summaryrefslogtreecommitdiff
path: root/linux/picker.c
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2002-01-27 20:05:42 +0000
committerDavid Dawes <dawes@xfree86.org>2002-01-27 20:05:42 +0000
commit44aa4d6297874022a4f5a49ea24f2d052584d3dc (patch)
treea3b8646dd51527d2fb246dbc11a124f4fd60968a /linux/picker.c
parent14945ada16218e9f918c24e0d702979fae9b07f6 (diff)
First pass merge of XFree86 4.2.0 import.
Diffstat (limited to 'linux/picker.c')
-rw-r--r--linux/picker.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/linux/picker.c b/linux/picker.c
index 4b4fbe90..6c228dfc 100644
--- a/linux/picker.c
+++ b/linux/picker.c
@@ -22,14 +22,9 @@
#define CONFIG_AGP 0
#endif
-#ifndef CONFIG_FB_SIS
-#define CONFIG_FB_SIS 0
-#endif
-
SMP = CONFIG_SMP
MODULES = CONFIG_MODULES
MODVERSIONS = CONFIG_MODVERSIONS
AGP = CONFIG_AGP
AGP_MODULE = CONFIG_AGP_MODULE
RELEASE = UTS_RELEASE
-SIS = CONFIG_FB_SIS