diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-08-12 16:03:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:32 +1000 |
| commit | d000b486ea1633380e6224c03e94227db46567ad (patch) | |
| tree | a1cb40e7daa042b24a3a6653236be224512600ac /drivers/char/drm | |
| parent | c2604ce05853939cf712ebc5acc0da4011289346 (diff) | |
| download | blackbird-op-linux-d000b486ea1633380e6224c03e94227db46567ad.tar.gz blackbird-op-linux-d000b486ea1633380e6224c03e94227db46567ad.zip | |
drm: add better explanation for i830/i915
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/Kconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index 5278c388d3e7..ef833a1c27eb 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig @@ -60,7 +60,9 @@ 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. This driver will eventually be replaced by the i915 one. + to work. This driver is used by the older X releases X.org 6.7 and + XFree86 4.3. If unsure, build this and i915 as modules and the X server + will load the correct one. config DRM_I915 tristate "i915 driver" @@ -68,8 +70,9 @@ config DRM_I915 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. + to work. This driver is used by the Intel driver in X.org 6.8 and + XFree86 4.4 and above. If unsure, build this and i830 as modules and + the X server will load the correct one. endchoice |
