diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-03-01 09:57:40 -0500 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-03-01 09:57:40 -0500 |
| commit | db38a29111cb9232b1982e583fd417ea9c97357c (patch) | |
| tree | 0ed373f0093432c88e2a082c6d757905a04381a6 /drivers/platform/x86/Kconfig | |
| parent | b466301b842f3a54e219b5cc587f22233ecb1345 (diff) | |
| parent | b1a96e3606b6efc3a6e9c8559ec6660e515b01a7 (diff) | |
Merge git://git.iksaif.net/acpi4asus into x86-platform
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 6848f213eb53..aef4f17cdfd4 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -59,6 +59,8 @@ config ASUS_LAPTOP | |||
| 59 | select NEW_LEDS | 59 | select NEW_LEDS |
| 60 | select BACKLIGHT_CLASS_DEVICE | 60 | select BACKLIGHT_CLASS_DEVICE |
| 61 | depends on INPUT | 61 | depends on INPUT |
| 62 | depends on RFKILL || RFKILL = n | ||
| 63 | select INPUT_SPARSEKMAP | ||
| 62 | ---help--- | 64 | ---help--- |
| 63 | This is the new Linux driver for Asus laptops. It may also support some | 65 | This is the new Linux driver for Asus laptops. It may also support some |
| 64 | MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate | 66 | MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate |