diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 13:57:12 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 13:57:12 -0500 |
| commit | 7d8c22060555a51c23b9c6a76b97a5e75b5db882 (patch) | |
| tree | 0cb2785c79acb7751ba5466d83e5eedcd59d6e3d /drivers/platform/x86/Kconfig | |
| parent | f02f465b1cdcdf7485f89ec019e6cceaf80cadd5 (diff) | |
| parent | de078e5747fa3a95efac04fd6725dcceb4520416 (diff) | |
Merge branch 'msi-wmi' into release
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e5e43121995d..ba3638fdf0ce 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -367,6 +367,18 @@ config ACPI_WMI | |||
| 367 | It is safe to enable this driver even if your DSDT doesn't define | 367 | It is safe to enable this driver even if your DSDT doesn't define |
| 368 | any ACPI-WMI devices. | 368 | any ACPI-WMI devices. |
| 369 | 369 | ||
| 370 | config MSI_WMI | ||
| 371 | tristate "MSI WMI extras" | ||
| 372 | depends on ACPI_WMI | ||
| 373 | depends on INPUT | ||
| 374 | depends on BACKLIGHT_CLASS_DEVICE | ||
| 375 | select INPUT_SPARSEKMAP | ||
| 376 | help | ||
| 377 | Say Y here if you want to support WMI-based hotkeys on MSI laptops. | ||
| 378 | |||
| 379 | To compile this driver as a module, choose M here: the module will | ||
| 380 | be called msi-wmi. | ||
| 381 | |||
| 370 | config ACPI_ASUS | 382 | config ACPI_ASUS |
| 371 | tristate "ASUS/Medion Laptop Extras (DEPRECATED)" | 383 | tristate "ASUS/Medion Laptop Extras (DEPRECATED)" |
| 372 | depends on ACPI | 384 | depends on ACPI |