diff --git a/[refs] b/[refs]
index a22ca46fc812..cfe817ff211d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46f2c4bd7e2ba2cfedbcd4fe15d316eebc608cba
+refs/heads/master: 64d74681433415855da02d2516f28d2ed859cde9
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c
index 595efd05ce44..53f64b76a8c1 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -87,7 +87,8 @@ void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
 {
 	struct input_polled_dev *poll_dev;
 
-	if (test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state))
+	if (test_bit(RFKILL_STATE_ALLOCATED, &rt2x00dev->rfkill_state) ||
+	    !test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
 		return;
 
 	poll_dev = input_allocate_polled_device();