[bk pull] DRM tree - stop i830/i915 in kernel

[Dave Airlie <airlied@linux.ie>]

Please do a

	bk pull bk://drm.bkbits.net/drm-2.6

This will include the latest DRM changes and will update the following files:

 drivers/char/drm/Kconfig |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

through these ChangeSets:

<airlied@starflyer.(none)> (04/08/29 1.1917)
   Stop i830 and i915 being built at the same time into the kernel
   Provide better info on which one is needed where...

   Signed-off-by: Dave Airlie <airlied@linux.ie>

diff -Nru a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
--- a/drivers/char/drm/Kconfig	Sun Aug 29 21:19:17 2004
+++ b/drivers/char/drm/Kconfig	Sun Aug 29 21:19:17 2004
@@ -57,22 +57,24 @@

 config DRM_I830
 	tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
-	depends on DRM && AGP && AGP_INTEL
+	depends on DRM && AGP && AGP_INTEL && !(DRM_I915=y)
 	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.
+	  This driver should be used for systems running Xorg 6.7 and XFree86 4.4
+	  or previous releases.

 config DRM_I915
 	tristate "Intel 830M, 845G, 852GM, 855GM, 865G, 915G"
-	depends on DRM && AGP && AGP_INTEL
+	depends on DRM && AGP && AGP_INTEL && !(DRM_I830=y)
 	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.
+	  to work. This driver should be used for systems running Xorg 6.8 and
+	  XFree86 releases after (but not including 4.4).


 config DRM_MGA