aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/Kconfig
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-02-18 14:46:19 -0500
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-02-18 14:46:19 -0500
commitc49f87aa34f7fa4850b8838a945475e4062bad61 (patch)
treee2d8af4d57671aa35798c1ddca503974ba40fff0 /drivers/gpu/drm/Kconfig
parenta12fc999485eb5d9ecad74554f0baac9688d28e2 (diff)
parent69ad303ab8321656d6144d13b2444a5595bb6581 (diff)
Merge commit 'v2.6.36.4' into linaro-2.6.36HEADmaster
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
-rw-r--r--drivers/gpu/drm/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 4cab0c6397e..aa17594a674 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -97,7 +97,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