From 9266bf53019b29a92c7e6c65e7b89bdae365b70d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 20 Jul 2004 11:35:29 +0000 Subject: Kconfig update add i915 bring over some stuff from kernel --- linux-core/Kconfig | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'linux-core/Kconfig') diff --git a/linux-core/Kconfig b/linux-core/Kconfig index 0dd10b8d..b92fde13 100644 --- a/linux-core/Kconfig +++ b/linux-core/Kconfig @@ -62,12 +62,22 @@ config DRM_I830 Choose this option if you have a system that has Intel 830M, 845G, 852GM, 855GM or 865G integrated graphics. If M is selected, the module will be called i830. AGP support is required for this driver - to work. + 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 + 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. config DRM_MGA tristate "Matrox g200/g400" - depends on DRM && AGP + depends on DRM && AGP && (!X86_64 || BROKEN) help 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 -- cgit v1.2.3