diff options
author | Seth Forshee <seth.forshee@canonical.com> | 2012-08-02 12:15:14 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-08-17 17:34:40 -0400 |
commit | f94f0f103c440f1dbe5d89a28c92fd1a9bdf7012 (patch) | |
tree | 37f1f063bc71a41b42b7d6dce8ddc75f13e0bfa5 | |
parent | a50bd128f28cf81c1250874fc53728e113f12957 (diff) | |
download | op-kernel-dev-f94f0f103c440f1dbe5d89a28c92fd1a9bdf7012.zip op-kernel-dev-f94f0f103c440f1dbe5d89a28c92fd1a9bdf7012.tar.gz |
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>
-rw-r--r-- | drivers/platform/x86/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 2a262f5..637074d 100644 --- a/drivers/platform/x86/Kconfig +++ b/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 |