diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-08 16:10:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-08 16:10:53 -0700 |
commit | 9bff9dbd00e5907f5c36e72bae8aee8a46440e11 (patch) | |
tree | 4a5666939b61a13e7cde01b29baf4cb609fb8c90 /drivers/acpi/Kconfig | |
parent | e2a6b85247aacc52d6ba0d9b37a99b8d1a3e0d83 (diff) | |
parent | d10c4ec8b4bc02f3874c7ef3c3539e4e7e123969 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 735f5ea1747..12cf5d491f0 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -260,6 +260,9 @@ config ACPI_ASUS config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" depends on X86 + select INPUT_POLLDEV + select NET + select RFKILL select BACKLIGHT_CLASS_DEVICE ---help--- This driver adds support for access to certain system settings |