diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/tokenring/lanstreamer.c | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
| -rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index b358bbbce33a..b3715efdce56 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -169,7 +169,7 @@ static char *open_min_error[] = { | |||
| 169 | "Monitor Contention failer for RPL", "FDX Protocol Error" | 169 | "Monitor Contention failer for RPL", "FDX Protocol Error" |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | /* Module paramters */ | 172 | /* Module parameters */ |
| 173 | 173 | ||
| 174 | /* Ring Speed 0,4,16 | 174 | /* Ring Speed 0,4,16 |
| 175 | * 0 = Autosense | 175 | * 0 = Autosense |