diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/skfp/h/smc.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/net/skfp/h/smc.h')
| -rw-r--r-- | drivers/net/skfp/h/smc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h index 026a83b9f743..c774a95902f5 100644 --- a/drivers/net/skfp/h/smc.h +++ b/drivers/net/skfp/h/smc.h | |||
| @@ -388,7 +388,7 @@ struct smt_config { | |||
| 388 | u_long rmt_t_poll ; /* RMT : claim/beacon poller */ | 388 | u_long rmt_t_poll ; /* RMT : claim/beacon poller */ |
| 389 | u_long rmt_dup_mac_behavior ; /* Flag for the beavior of SMT if | 389 | u_long rmt_dup_mac_behavior ; /* Flag for the beavior of SMT if |
| 390 | * a Duplicate MAC Address was detected. | 390 | * a Duplicate MAC Address was detected. |
| 391 | * FALSE: SMT will leave finaly the ring | 391 | * FALSE: SMT will leave finally the ring |
| 392 | * TRUE: SMT will reinstert into the ring | 392 | * TRUE: SMT will reinstert into the ring |
| 393 | */ | 393 | */ |
| 394 | u_long mac_d_max ; /* MAC : D_Max timer value */ | 394 | u_long mac_d_max ; /* MAC : D_Max timer value */ |