diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/wan/lmc/lmc_main.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/wan/lmc/lmc_main.c')
| -rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 70feb84df670..b7f2358d23be 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * | 24 | * |
| 25 | * Linux driver notes: | 25 | * Linux driver notes: |
| 26 | * Linux uses the device struct lmc_private to pass private information | 26 | * Linux uses the device struct lmc_private to pass private information |
| 27 | * arround. | 27 | * around. |
| 28 | * | 28 | * |
| 29 | * The initialization portion of this driver (the lmc_reset() and the | 29 | * The initialization portion of this driver (the lmc_reset() and the |
| 30 | * lmc_dec_reset() functions, as well as the led controls and the | 30 | * lmc_dec_reset() functions, as well as the led controls and the |