summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-10-05 12:12:01 +0000
committerDave Airlie <airlied@linux.ie>2004-10-05 12:12:01 +0000
commit4dbc1e87288987f0506087c7971639c33af8fe3e (patch)
tree060c2090de8de0a59130e4c76b599e43bac779a5
parent6dee8401a65c2b976dad8937985439fb8f0887be (diff)
Patch for Kconfig for making i830/i915 not build together
-rw-r--r--linux-core/Kconfig14
1 files changed, 9 insertions, 5 deletions
diff --git a/linux-core/Kconfig b/linux-core/Kconfig
index 440e414b..2fbf5df6 100644
--- a/linux-core/Kconfig
+++ b/linux-core/Kconfig
@@ -48,9 +48,13 @@ config DRM_I810
selected, the module will be called i810. AGP support is required
for this driver to work.
-config DRM_I830
- tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
+choice
+ prompt "Intel 830M, 845G, 852GM, 855GM, 865G"
depends on DRM && AGP && AGP_INTEL
+ optional
+
+config DRM_I830
+ tristate "i830 driver"
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
@@ -58,15 +62,15 @@ config DRM_I830
to work. This driver will eventually be replaced by the i915 one.
config DRM_I915
- tristate "Intel 830M, 845G, 852GM, 855GM, 865G, 915G"
- depends on DRM && AGP && AGP_INTEL
+ tristate "i915 driver"
help
Choose this option if you have a system that has Intel 830M, 845G,
852GM, 855GM 865G or 915G integrated graphics. If M is selected, the
module will be called i915. AGP support is required for this driver
to work. This driver will eventually replace the I830 driver, when
later release of X start to use the new DDX and DRI.
-
+
+endchoice
config DRM_MGA
tristate "Matrox g200/g400"