From: Randy Dunlap Date: Mon, 16 Sep 2013 18:10:51 +0000 (-0700) Subject: platform/x86: fix asus-wmi build error X-Git-Tag: firefly_0821_release~176^2~5113 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea89e1d320ebde318ae0217fec625102b9165774;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Linus Torvalds --- 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 depends on BACKLIGHT_CLASS_DEVICE depends on RFKILL || RFKILL = n depends on HOTPLUG_PCI + depends on ACPI_VIDEO || ACPI_VIDEO = n select INPUT_SPARSEKMAP select LEDS_CLASS select NEW_LEDS