From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 14 Jun 2009 13:21:25 +0000 (+0200)
Subject: Bluetooth: Fix Kconfig issue with RFKILL integration
X-Git-Tag: v2.6.31-rc1~330^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1a097181ee8b0c492c021eb3dbaa5f9cd813ad0e;p=linux.git

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>
---

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 7725da95a767..59fdb1d2e8ed 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