Hi Linus,
This is just a proper fix to stop the i830/i915 being built into the same
kernel I missed Romans post that contained it until now...
Please do a
bk pull bk://drm.bkbits.net/drm-2.6
This will include the latest DRM changes and will update the following files:
drivers/char/drm/Kconfig | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
through these ChangeSets:
<airlied@starflyer.(none)> (04/10/05 1.2051)
drm: Stop i830 and i915 both being build at same time
Roman Zippel submitted this to lk but I missed it, it does
what I tried to do badly before.
Signed-off-by: Dave Airlie <[email protected]>
diff -Nru a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
--- a/drivers/char/drm/Kconfig 2004-10-05 19:30:37 +10:00
+++ b/drivers/char/drm/Kconfig 2004-10-05 19:30:37 +10:00
@@ -55,9 +55,13 @@
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
@@ -65,8 +69,7 @@
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
@@ -74,6 +77,7 @@
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"