diff --git a/[refs] b/[refs]
index 3aba8fb3e6e4..878735b1cb32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403dbb97f654cd59b87999fe1b64d29bf90b3a2a
+refs/heads/master: 1a097181ee8b0c492c021eb3dbaa5f9cd813ad0e
diff --git a/trunk/net/bluetooth/Kconfig b/trunk/net/bluetooth/Kconfig
index 7725da95a767..59fdb1d2e8ed 100644
--- a/trunk/net/bluetooth/Kconfig
+++ b/trunk/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