diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /drivers/acpi/Kconfig | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index cbfc58d60236..dc1de7224426 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -253,6 +253,9 @@ config ACPI_ASUS | |||
| 253 | config ACPI_TOSHIBA | 253 | config ACPI_TOSHIBA |
| 254 | tristate "Toshiba Laptop Extras" | 254 | tristate "Toshiba Laptop Extras" |
| 255 | depends on X86 && INPUT | 255 | depends on X86 && INPUT |
| 256 | select INPUT_POLLDEV | ||
| 257 | select NET | ||
| 258 | select RFKILL | ||
| 256 | select BACKLIGHT_CLASS_DEVICE | 259 | select BACKLIGHT_CLASS_DEVICE |
| 257 | ---help--- | 260 | ---help--- |
| 258 | This driver adds support for access to certain system settings | 261 | This driver adds support for access to certain system settings |