diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
| commit | 0a8c5395f90f06d128247844b2515c8bf3f2826b (patch) | |
| tree | d95382dcdfa303b99d480c01763d6cb6767fdaca /Documentation/networking/README.ipw2200 | |
| parent | 25051158bbed127e8672b43396c71c5eb610e5f1 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
[XFS] Fix merge failures
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'Documentation/networking/README.ipw2200')
| -rw-r--r-- | Documentation/networking/README.ipw2200 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200 index 4f2a40f1dbc6..80c728522c4c 100644 --- a/Documentation/networking/README.ipw2200 +++ b/Documentation/networking/README.ipw2200 | |||
| @@ -147,7 +147,7 @@ Where the supported parameter are: | |||
| 147 | driver. If disabled, the driver will not attempt to scan | 147 | driver. If disabled, the driver will not attempt to scan |
| 148 | for and associate to a network until it has been configured with | 148 | for and associate to a network until it has been configured with |
| 149 | one or more properties for the target network, for example configuring | 149 | one or more properties for the target network, for example configuring |
| 150 | the network SSID. Default is 1 (auto-associate) | 150 | the network SSID. Default is 0 (do not auto-associate) |
| 151 | 151 | ||
| 152 | Example: % modprobe ipw2200 associate=0 | 152 | Example: % modprobe ipw2200 associate=0 |
| 153 | 153 | ||