aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-14 15:21:25 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-06-14 15:30:51 +0200
commit1a097181ee8b0c492c021eb3dbaa5f9cd813ad0e (patch)
treee47ad149e37fccf8c9a90f0ea0e1c145f0317779 /net
parent403dbb97f654cd59b87999fe1b64d29bf90b3a2a (diff)
downloadlinux-2.6.34-ux500-1a097181ee8b0c492c021eb3dbaa5f9cd813ad0e.tar.gz
Bluetooth: Fix Kconfig issue with RFKILL integration
Since the re-write of the RFKILL subsystem it is no longer good to just select RFKILL, but it is important to add a proper depends on rule. Based on a report by Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 7725da95a76..59fdb1d2e8e 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -3,8 +3,9 @@
#
menuconfig BT
- depends on NET && !S390
tristate "Bluetooth subsystem support"
+ depends on NET && !S390
+ depends on RFKILL || !RFKILL
help
Bluetooth is low-cost, low-power, short-range wireless technology.
It was designed as a replacement for cables and other short-range