summaryrefslogtreecommitdiff
path: root/linux-core/Kconfig
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2003-08-15 10:31:54 +0000
committerMichel Daenzer <michel@daenzer.net>2003-08-15 10:31:54 +0000
commit9d7b01ebbe71ff6ca3ea421d5bff64f403b592ba (patch)
tree8f5d66868305facceb7d0ecdde93c5569c8b5a53 /linux-core/Kconfig
parenta073ff7dc73dc98e81e2ae26e8c500ea7141084b (diff)
Merge from 2.6 kernel (Linus Torvalds)
Diffstat (limited to 'linux-core/Kconfig')
-rw-r--r--linux-core/Kconfig19
1 files changed, 14 insertions, 5 deletions
diff --git a/linux-core/Kconfig b/linux-core/Kconfig
index 994371de..d0358e95 100644
--- a/linux-core/Kconfig
+++ b/linux-core/Kconfig
@@ -24,10 +24,10 @@ config DRM_TDFX
config DRM_GAMMA
tristate "3dlabs GMX 2000"
- depends on DRM && n
+ depends on DRM
help
- This is the old gamma driver, disabled for now unless somebody
- tells me it actually might work.
+ This is the old gamma driver, please tell me if it might actually
+ work.
config DRM_R128
tristate "ATI Rage 128"
@@ -49,7 +49,7 @@ config DRM_RADEON
config DRM_I810
tristate "Intel I810"
- depends on DRM && AGP
+ depends on DRM && AGP && AGP_INTEL
help
Choose this option if you have an Intel I810 graphics card. If M is
selected, the module will be called i810. AGP support is required
@@ -57,7 +57,7 @@ config DRM_I810
config DRM_I830
tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
- depends on DRM && AGP
+ depends on DRM && AGP && AGP_INTEL
help
Choose this option if you have a system that has Intel 830M, 845G,
852GM, 855GM or 865G integrated graphics. If M is selected, the
@@ -72,3 +72,12 @@ config DRM_MGA
Choose this option if you have a Matrox G200, G400 or G450 graphics
card. If M is selected, the module will be called mga. AGP
support is required for this driver to work.
+
+config DRM_SIS
+ tristate "SiS video cards"
+ depends on DRM && AGP && FB_SIS
+ help
+ Choose this option if you have a SiS 630 or compatibel video
+ chipset. If M is selected the module will be called sis. AGP
+ and SiS FB support is required for this driver to work.
+