diff --git a/[refs] b/[refs]
index a5ffcca2c61a..314c977de311 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0070f8c738f757c2dda521d6bc310dc2dfdbf643
+refs/heads/master: c6c33a779dfe7aa8254be4da08c217914f1390a0
diff --git a/trunk/Documentation/networking/README.ipw2200 b/trunk/Documentation/networking/README.ipw2200
index acb30c5dcff3..c3504f5aedcd 100644
--- a/trunk/Documentation/networking/README.ipw2200
+++ b/trunk/Documentation/networking/README.ipw2200
@@ -247,8 +247,8 @@ and can set the contents via echo.  For example:
 % cat /sys/bus/pci/drivers/ipw2200/debug_level
 
 Will report the current debug level of the driver's logging subsystem 
-(only available if CONFIG_IPW_DEBUG was configured when the driver was 
-built).
+(only available if CONFIG_IPW2200_DEBUG was configured when the driver
+was built).
 
 You can set the debug level via: