---

yaml --- r: 260053 b: refs/heads/master c: 66dca51 h: refs/heads/master i: 260051: 7bc276d v: v3
git-mirror · Jul 15, 2011 · 06052f3 · 06052f3
1 parent 6dd7b8e
commit 06052f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78010c75d290d8061fbbd75625101f382c44f204
+refs/heads/master: 66dca5178c70b7bb5ae1761e175569eac8708e1e
diff --git a/trunk/drivers/staging/gma500/Kconfig b/trunk/drivers/staging/gma500/Kconfig
@@ -1,6 +1,6 @@
 config DRM_PSB
 	tristate "Intel GMA5/600 KMS Framebuffer"
-	depends on DRM && PCI && X86
+	depends on DRM && PCI && X86 && ACPI_VIDEO
 	select FB_CFB_COPYAREA
         select FB_CFB_FILLRECT
         select FB_CFB_IMAGEBLIT