---

yaml --- r: 232330 b: refs/heads/master c: f7ab9b4 h: refs/heads/master v: v3
git-mirror · Jan 20, 2011 · 00ecaae · 00ecaae
1 parent dc50a3c
commit 00ecaae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8616b6ced6137085e6657cc63bc2fe3900b8616
+refs/heads/master: f7ab9b407b3bc83161c2aa74c992ba4782e87c9c
diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig
@@ -100,7 +100,10 @@ config DRM_I830
 config DRM_I915
 	tristate "i915 driver"
 	depends on AGP_INTEL
+	# we need shmfs for the swappable backing store, and in particular
+	# the shmem_readpage() which depends upon tmpfs
 	select SHMEM
+	select TMPFS
 	select DRM_KMS_HELPER
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA