diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-20 13:11:02 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-20 13:11:02 +0800 |
| commit | fe4cc50983bdaf51bf29ef041f65e0007f547844 (patch) | |
| tree | f92f233efb08d7fcae8181553ecda8def4ad2e31 /linux-core/Kconfig | |
| parent | 8398b99d8d146278adc13d6093811e53cd42c88a (diff) | |
| parent | 209870a88262a4a27b36e5cc97f3b1e7021dbefd (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core/Kconfig')
| -rw-r--r-- | linux-core/Kconfig | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/linux-core/Kconfig b/linux-core/Kconfig index d2ca98f2..2d02c765 100644 --- a/linux-core/Kconfig +++ b/linux-core/Kconfig @@ -53,22 +53,13 @@ choice 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 - module will be called i830. AGP support is required for this driver - to work. This driver will eventually be replaced by the i915 one. - config DRM_I915 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. + 852GM, 855GM, 865G, 915G, 915GM, 945G, 945GM and 965G integrated + graphics. If M is selected, the module will be called i915. + AGP support is required for this driver to work. endchoice |