diff --git a/[refs] b/[refs] index 820bb6286ddb..eb04e421c398 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79e539453b34e35f39299a899d263b0a1f1670bd +refs/heads/master: 06d9f33ceb6be29c453915505a2fc88d80c36417 diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index 5f26d6c840de..6903e5436f85 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/drivers/gpu/drm/Kconfig @@ -65,6 +65,11 @@ config DRM_I830 will load the correct one. config DRM_I915 + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + select I2C_ALGOBIT + depends on FB tristate "i915 driver" help Choose this option if you have a system that has Intel 830M, 845G,