aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-10 09:37:02 -0500
committerMatthew Garrett <mjg@redhat.com>2011-01-10 11:55:25 -0500
commit0c51a4d8abd6ed5ba55f828840c6b78ab672644b (patch)
treed2e147da632df6a00c17d3403c05b9f33a7b954d /drivers/platform/x86
parenta46a780835f394869e1fbbef8b528a1e02193e78 (diff)
platform/x86: Consistently select LEDS Kconfig options
Currently the x86 platform devices are not consistent about selecting or depending on the LEDs Kconfig variables, and this inconsistency leads to Kconfig getting upset and refusing to offer LEDs (even on non-x86 platforms): drivers/platform/x86/Kconfig:422:error: recursive dependency detected! drivers/platform/x86/Kconfig:422: symbol EEEPC_WMI depends on ACPI_WMI drivers/platform/x86/Kconfig:438: symbol ACPI_WMI is selected by ACER_WMI drivers/platform/x86/Kconfig:18: symbol ACER_WMI depends on LEDS_CLASS drivers/leds/Kconfig:10: symbol LEDS_CLASS is selected by EEEPC_WMI Fix this by always selecting rather than depending on the symbols as slightly more drivers use this approach already and it seems more user friendly. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a122a0dac981..d163bc2e2b9e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -18,8 +18,8 @@ if X86_PLATFORM_DEVICES
18config ACER_WMI 18config ACER_WMI
19 tristate "Acer WMI Laptop Extras" 19 tristate "Acer WMI Laptop Extras"
20 depends on ACPI 20 depends on ACPI
21 depends on LEDS_CLASS 21 select LEDS_CLASS
22 depends on NEW_LEDS 22 select NEW_LEDS
23 depends on BACKLIGHT_CLASS_DEVICE 23 depends on BACKLIGHT_CLASS_DEVICE
24 depends on SERIO_I8042 24 depends on SERIO_I8042
25 depends on INPUT 25 depends on INPUT
@@ -516,8 +516,8 @@ config TOPSTAR_LAPTOP
516config ACPI_TOSHIBA 516config ACPI_TOSHIBA
517 tristate "Toshiba Laptop Extras" 517 tristate "Toshiba Laptop Extras"
518 depends on ACPI 518 depends on ACPI
519 depends on LEDS_CLASS 519 select LEDS_CLASS
520 depends on NEW_LEDS 520 select NEW_LEDS
521 depends on BACKLIGHT_CLASS_DEVICE 521 depends on BACKLIGHT_CLASS_DEVICE
522 depends on INPUT 522 depends on INPUT
523 depends on RFKILL || RFKILL = n 523 depends on RFKILL || RFKILL = n