From d54e2ce8eed121214e8cd756ae0160d24e4bb16d Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 22 Nov 2009 15:40:31 +0000
Subject: [PATCH] --- yaml --- r: 168904 b: refs/heads/master c:
 ca9ab10033d190c1ede85fdf456307bdfdabf079 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5411871eb757..a5538ce57971 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9e0eea9955bffbe5e5cd6355157cabddc31f17
+refs/heads/master: ca9ab10033d190c1ede85fdf456307bdfdabf079
diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig
index f831ea159291..96eddd17e050 100644
--- a/trunk/drivers/gpu/drm/Kconfig
+++ b/trunk/drivers/gpu/drm/Kconfig
@@ -92,6 +92,7 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	select SHMEM
 	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA