diff options
author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
---|---|---|
committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/gpu/drm/Kconfig | |
parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
-rw-r--r-- | drivers/gpu/drm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 4cab0c6397e3..aa17594a674a 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -97,7 +97,10 @@ config DRM_I830 | |||
97 | config DRM_I915 | 97 | config DRM_I915 |
98 | tristate "i915 driver" | 98 | tristate "i915 driver" |
99 | depends on AGP_INTEL | 99 | depends on AGP_INTEL |
100 | # we need shmfs for the swappable backing store, and in particular | ||
101 | # the shmem_readpage() which depends upon tmpfs | ||
100 | select SHMEM | 102 | select SHMEM |
103 | select TMPFS | ||
101 | select DRM_KMS_HELPER | 104 | select DRM_KMS_HELPER |
102 | select FB_CFB_FILLRECT | 105 | select FB_CFB_FILLRECT |
103 | select FB_CFB_COPYAREA | 106 | select FB_CFB_COPYAREA |