From 8e5c1b20fd59ab06edf04762b844f5f14eb2fe4e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 12 Aug 2006 16:03:52 +1000 Subject: [PATCH] --- yaml --- r: 37505 b: refs/heads/master c: d000b486ea1633380e6224c03e94227db46567ad h: refs/heads/master i: 37503: 7ec9a829b73c136bfb2004cd0dad8c4d3033403e v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/Kconfig | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bb97c54e30f9..abced3534e29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2604ce05853939cf712ebc5acc0da4011289346 +refs/heads/master: d000b486ea1633380e6224c03e94227db46567ad diff --git a/trunk/drivers/char/drm/Kconfig b/trunk/drivers/char/drm/Kconfig index 5278c388d3e7..ef833a1c27eb 100644 --- a/trunk/drivers/char/drm/Kconfig +++ b/trunk/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