diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-20 11:35:29 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-20 11:35:29 +0000 |
| commit | 9266bf53019b29a92c7e6c65e7b89bdae365b70d (patch) | |
| tree | dd90fcf01b5507ef93a8986c386900f7855b6937 | |
| parent | b20b00d4bc49534ba6e3695fb05cfc240bd3f0af (diff) | |
Kconfig update add i915 bring over some stuff from kernel
| -rw-r--r-- | linux-core/Kconfig | 14 | ||||
| -rw-r--r-- | linux/Kconfig | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/linux-core/Kconfig b/linux-core/Kconfig index 0dd10b8da..b92fde134 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 diff --git a/linux/Kconfig b/linux/Kconfig index 0dd10b8da..b92fde134 100644 --- a/linux/Kconfig +++ b/linux/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 |