From a3f135e7cde658b06e5914b206376aa3cbfdbd8e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Sat, 13 Dec 2008 18:21:08 +1000
Subject: [PATCH] --- yaml --- r: 123430 b: refs/heads/master c:
 57a6297e52b32ff402291a7d8fd802f83e746e52 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/gpu/drm/Kconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9feda687b784..7654fab12bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae14dc0505261978ca06075ac39cc5422c6c6b57
+refs/heads/master: 57a6297e52b32ff402291a7d8fd802f83e746e52
diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig
index 6903e5436f85..5130b72d593c 100644
--- a/trunk/drivers/gpu/drm/Kconfig
+++ b/trunk/drivers/gpu/drm/Kconfig
@@ -7,6 +7,8 @@
 menuconfig DRM
 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
 	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
+	select I2C
+	select I2C_ALGOBIT
 	help
 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
 	  introduced in XFree86 4.0. If you say Y here, you need to select
@@ -68,7 +70,6 @@ config DRM_I915
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select I2C_ALGOBIT
 	depends on FB
 	tristate "i915 driver"
 	help