diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 18:29:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 18:29:34 -0700 |
| commit | 9c5ea3675dbe4853eea747542da257c3e6f18de2 (patch) | |
| tree | 575a9498cc4156c4c938e2a39b5c4b3f5a46936f /drivers/platform/x86/Kconfig | |
| parent | c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394 (diff) | |
| parent | a8ec105c0764c848d59f18a31f91fa00c99b2e7f (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
hp-wmi: Fix query interface
ACPI_TOSHIBA needs LEDS support
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 044f430f3b43..cff7cc2c1f02 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -486,10 +486,12 @@ config TOPSTAR_LAPTOP config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" depends on ACPI + depends on LEDS_CLASS + depends on NEW_LEDS + depends on BACKLIGHT_CLASS_DEVICE depends on INPUT depends on RFKILL || RFKILL = n select INPUT_POLLDEV - select BACKLIGHT_CLASS_DEVICE ---help--- This driver adds support for access to certain system settings on "legacy free" Toshiba laptops. These laptops can be recognized by |