Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / Documentation / networking / README.ipw2200

diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
index 4f2a40f1dbc629837463a96695759e3848f41c68..80c728522c4c7a0482d1804689f87869d9c404c0 100644 (file)
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
@@ -147,7 +147,7 @@ Where the supported parameter are:
        driver.  If disabled, the driver will not attempt to scan 
        for and associate to a network until it has been configured with 
        one or more properties for the target network, for example configuring 
        driver.  If disabled, the driver will not attempt to scan 
        for and associate to a network until it has been configured with 
        one or more properties for the target network, for example configuring 

-       the network SSID.  Default is 1 (auto-associate)
+       the network SSID.  Default is 0 (do not auto-associate)

        
        Example: % modprobe ipw2200 associate=0
 
        
        Example: % modprobe ipw2200 associate=0