aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorSeth Forshee <seth.forshee@canonical.com>2012-08-02 13:15:14 -0400
committerMatthew Garrett <mjg@redhat.com>2012-08-17 17:34:40 -0400
commitf94f0f103c440f1dbe5d89a28c92fd1a9bdf7012 (patch)
tree37f1f063bc71a41b42b7d6dce8ddc75f13e0bfa5 /drivers/platform
parenta50bd128f28cf81c1250874fc53728e113f12957 (diff)
apple-gmux: Fix kconfig dependencies
Fix the dependencies of apple-gmux to prevent it from being built-in when one or more of its dependencies is built as a module. Otherwise it can fail to build due to missing symbols. v2: Add dependency on ACPI to fix build failure when ACPI=n Reported-by: Arun Raghavan <arun.raghavan@collabora.co.uk> Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2a262f5c5c0c..637074d89790 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -758,8 +758,11 @@ config SAMSUNG_Q10
758 758
759config APPLE_GMUX 759config APPLE_GMUX
760 tristate "Apple Gmux Driver" 760 tristate "Apple Gmux Driver"
761 depends on ACPI
761 depends on PNP 762 depends on PNP
762 select BACKLIGHT_CLASS_DEVICE 763 depends on BACKLIGHT_CLASS_DEVICE
764 depends on BACKLIGHT_APPLE=n || BACKLIGHT_APPLE
765 depends on ACPI_VIDEO=n || ACPI_VIDEO
763 ---help--- 766 ---help---
764 This driver provides support for the gmux device found on many 767 This driver provides support for the gmux device found on many
765 Apple laptops, which controls the display mux for the hybrid 768 Apple laptops, which controls the display mux for the hybrid