From 70a0ce4ef15fa8bba4001f70e36afb55a72a2867 Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee@canonical.com>
Date: Thu, 2 Aug 2012 12:15:14 -0500
Subject: [PATCH] --- yaml --- r: 321871 b: refs/heads/master c:
 f94f0f103c440f1dbe5d89a28c92fd1a9bdf7012 h: refs/heads/master i:   321869:
 c63e583b7d936f75d374092ea7a0096ed5e468e0   321867:
 e1eb0fc087ceb368ba37386e60a121a267aa3d19   321863:
 ea8e710d161c71eb43697b94df40d073038696ba   321855:
 f16b8c1deb1c63c5241df0698213cc1dc6115e47 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/platform/x86/Kconfig | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 549345122672..e9bbe178de8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a50bd128f28cf81c1250874fc53728e113f12957
+refs/heads/master: f94f0f103c440f1dbe5d89a28c92fd1a9bdf7012
diff --git a/trunk/drivers/platform/x86/Kconfig b/trunk/drivers/platform/x86/Kconfig
index 2a262f5c5c0c..637074d89790 100644
--- a/trunk/drivers/platform/x86/Kconfig
+++ b/trunk/drivers/platform/x86/Kconfig
@@ -758,8 +758,11 @@ config SAMSUNG_Q10
 
 config APPLE_GMUX
 	tristate "Apple Gmux Driver"
+	depends on ACPI
 	depends on PNP
-	select BACKLIGHT_CLASS_DEVICE
+	depends on BACKLIGHT_CLASS_DEVICE
+	depends on BACKLIGHT_APPLE=n || BACKLIGHT_APPLE
+	depends on ACPI_VIDEO=n || ACPI_VIDEO
 	---help---
 	  This driver provides support for the gmux device found on many
 	  Apple laptops, which controls the display mux for the hybrid