diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:08:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:08:08 -0400 |
| commit | fffdedef691a0f6fa7ca1fc0a2a508cbb49def69 (patch) | |
| tree | 124b128308a4d35bab0ac8001da4b324d40220eb /drivers/acpi | |
| parent | 5723ff931a94acf0738df42604ee89f852e151b0 (diff) | |
| parent | bf94e17bc8d35fc339945a42990a2f2b5e9b5a40 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net/mac80211/rx.c: fix build error
acpi: Make ACPI_TOSHIBA depend on INPUT.
net/bfin_mac.c MDIO namespace fixes
jme: remove unused #include <version.h>
netfilter: remove unused #include <version.h>
net: Fix off-by-one in skb_dma_map
smc911x: Add support for LAN921{5,7,8} chips from SMSC
qlge: remove duplicated #include
wireless: remove duplicated #include
net/au1000_eth.c MDIO namespace fixes
net/tc35815.c: fix compilation
sky2: Fix WOL regression
r8169: NULL pointer dereference on r8169 load
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 12cf5d491f0d..da49b006bcc5 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -259,7 +259,7 @@ config ACPI_ASUS | |||
| 259 | 259 | ||
| 260 | config ACPI_TOSHIBA | 260 | config ACPI_TOSHIBA |
| 261 | tristate "Toshiba Laptop Extras" | 261 | tristate "Toshiba Laptop Extras" |
| 262 | depends on X86 | 262 | depends on X86 && INPUT |
| 263 | select INPUT_POLLDEV | 263 | select INPUT_POLLDEV |
| 264 | select NET | 264 | select NET |
| 265 | select RFKILL | 265 | select RFKILL |