diff options
author | Randy Dunlap <rdunlap@infradead.org> | 2013-08-22 12:06:23 -0400 |
---|---|---|
committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-09-05 08:52:27 -0400 |
commit | 5ff67df324e8440405e620bc05ea0600f07a8a27 (patch) | |
tree | 40a72ca236a7a5e2b735edaac955fd100c4e1704 /drivers/platform | |
parent | 18a0393543fa3b04278cce235d3d76a13c877b94 (diff) |
samsung-laptop: fix config build error
Fix build failure when ACPI_VIDEO=m and SAMSUNG_LAPTOP=y.
The patch prevents that specific config combination.
drivers/built-in.o: In function `samsung_init':
samsung-laptop.c:(.init.text+0x128ff): undefined reference to `acpi_video_unregister'
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
build testing:
ACPI_VIDEO=m, SAMSUNG_LAPTOP=m: OK
ACPI_VIDEO=y, SAMSUNG_LAPTOP=m: OK
ACPI_VIDEO=y, SAMSUNG_LAPTOP=y: OK
ACPI=n, SAMSUNG_LAPTOP=y: OK
ACPI=n, SAMSUNG_LAPTOP=m: OK
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
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 e5b17b1c8398..96d6b2eef4f2 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -732,6 +732,7 @@ config SAMSUNG_LAPTOP | |||
732 | tristate "Samsung Laptop driver" | 732 | tristate "Samsung Laptop driver" |
733 | depends on X86 | 733 | depends on X86 |
734 | depends on RFKILL || RFKILL = n | 734 | depends on RFKILL || RFKILL = n |
735 | depends on ACPI_VIDEO || ACPI_VIDEO = n | ||
735 | depends on BACKLIGHT_CLASS_DEVICE | 736 | depends on BACKLIGHT_CLASS_DEVICE |
736 | select LEDS_CLASS | 737 | select LEDS_CLASS |
737 | select NEW_LEDS | 738 | select NEW_LEDS |