summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-12-16 13:57:16 -0500
committerLen Brown <len.brown@intel.com>2009-12-16 13:57:16 -0500
commit243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a (patch)
treeaf808f66a8a8518c82c0e8189df7ac0d4252f31b /drivers/platform/x86/Kconfig
parent7d8c22060555a51c23b9c6a76b97a5e75b5db882 (diff)
parent42b4e9ee3d1d3b691bcae37f217f08740320c58c (diff)
downloadblackbird-op-linux-243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a.tar.gz
blackbird-op-linux-243e1ef842ef9e24fbf1cc7ddf4fd1c01471544a.zip
Merge branch 'toshiba-bt' into release
Diffstat (limited to 'drivers/platform/x86/Kconfig')
-rw-r--r--drivers/platform/x86/Kconfig15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ba3638fdf0ce..fc5bf9d2a3f3 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -449,4 +449,19 @@ config ACPI_TOSHIBA
If you have a legacy free Toshiba laptop (such as the Libretto L1
series), say Y.
+
+config TOSHIBA_BT_RFKILL
+ tristate "Toshiba Bluetooth RFKill switch support"
+ depends on ACPI
+ ---help---
+ This driver adds support for Bluetooth events for the RFKill
+ switch on modern Toshiba laptops with full ACPI support and
+ an RFKill switch.
+
+ This driver handles RFKill events for the TOS6205 Bluetooth,
+ and re-enables it when the switch is set back to the 'on'
+ position.
+
+ If you have a modern Toshiba laptop with a Bluetooth and an
+ RFKill switch (such as the Portege R500), say Y.
endif # X86_PLATFORM_DEVICES
OpenPOWER on IntegriCloud