diff --git a/[refs] b/[refs]
index 24ac444a842c..5f542109c0f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4aee8c21ff5d8d6f9a27112468f5e840d5ced1b
+refs/heads/master: 53788015c736b9957448aebd7b7c286da217ee51
diff --git a/trunk/drivers/net/wireless/Kconfig b/trunk/drivers/net/wireless/Kconfig
index 057405067226..9d4c2fb671e2 100644
--- a/trunk/drivers/net/wireless/Kconfig
+++ b/trunk/drivers/net/wireless/Kconfig
@@ -164,7 +164,7 @@ config IPW2100
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called ipw2100.ko.
 	
-config IPW2100_PROMISC
+config IPW2100_MONITOR
         bool "Enable promiscuous mode"
         depends on IPW2100
         ---help---