diff --git a/[refs] b/[refs]
index f81bf4d0ceb0..deed5499b747 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 749387dc8d8270b279f27a0a794cdf4f4a4aa774
+refs/heads/master: 0c1a14c2c17f13c1869e82783bd49774bba67254
diff --git a/trunk/drivers/gpu/drm/gma500/Kconfig b/trunk/drivers/gpu/drm/gma500/Kconfig
index 42e665c7e90a..92760ffad2e8 100644
--- a/trunk/drivers/gpu/drm/gma500/Kconfig
+++ b/trunk/drivers/gpu/drm/gma500/Kconfig
@@ -2,10 +2,15 @@ config DRM_GMA500
 	tristate "Intel GMA5/600 KMS Framebuffer"
 	depends on DRM && PCI && X86 && EXPERIMENTAL
 	select FB_CFB_COPYAREA
-        select FB_CFB_FILLRECT
-        select FB_CFB_IMAGEBLIT
-        select DRM_KMS_HELPER
-        select DRM_TTM
+	select FB_CFB_FILLRECT
+	select FB_CFB_IMAGEBLIT
+	select DRM_KMS_HELPER
+	select DRM_TTM
+	# GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
+	select ACPI_VIDEO if ACPI
+	select BACKLIGHT_CLASS_DEVICE if ACPI
+	select VIDEO_OUTPUT_CONTROL if ACPI
+	select INPUT if ACPI
 	help
 	  Say yes for an experimental 2D KMS framebuffer driver for the
 	  Intel GMA500 ('Poulsbo') and other Intel IMG based graphics