diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/gpu/drm/Kconfig | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index f831ea159291..96eddd17e050 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
| @@ -92,6 +92,7 @@ config DRM_I830 | |||
| 92 | config DRM_I915 | 92 | config DRM_I915 |
| 93 | tristate "i915 driver" | 93 | tristate "i915 driver" |
| 94 | depends on AGP_INTEL | 94 | depends on AGP_INTEL |
| 95 | select SHMEM | ||
| 95 | select DRM_KMS_HELPER | 96 | select DRM_KMS_HELPER |
| 96 | select FB_CFB_FILLRECT | 97 | select FB_CFB_FILLRECT |
| 97 | select FB_CFB_COPYAREA | 98 | select FB_CFB_COPYAREA |