diff options
author | Randy Dunlap <rdunlap@infradead.org> | 2013-09-16 14:10:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-23 02:57:57 -0400 |
commit | ea89e1d320ebde318ae0217fec625102b9165774 (patch) | |
tree | c2d230d0c2defc48dd68148efc58cdfb70ea9825 /drivers/platform | |
parent | d4eddd42f592a0cf06818fae694a3d271f842e4d (diff) |
platform/x86: fix asus-wmi build error
Fix build error in asus_wmi.c when ASUS_WMI=y and ACPI_VIDEO=m
by preventing that combination.
drivers/built-in.o: In function `asus_wmi_probe':
asus-wmi.c:(.text+0x65ddb4): undefined reference to `acpi_video_unregister'
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 96d6b2eef4f2..b51a7460cc49 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -504,6 +504,7 @@ config ASUS_WMI | |||
504 | depends on BACKLIGHT_CLASS_DEVICE | 504 | depends on BACKLIGHT_CLASS_DEVICE |
505 | depends on RFKILL || RFKILL = n | 505 | depends on RFKILL || RFKILL = n |
506 | depends on HOTPLUG_PCI | 506 | depends on HOTPLUG_PCI |
507 | depends on ACPI_VIDEO || ACPI_VIDEO = n | ||
507 | select INPUT_SPARSEKMAP | 508 | select INPUT_SPARSEKMAP |
508 | select LEDS_CLASS | 509 | select LEDS_CLASS |
509 | select NEW_LEDS | 510 | select NEW_LEDS |