diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/skfp/h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/skfp/h')
| -rw-r--r-- | drivers/net/skfp/h/smc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h index 1758d9548361..026a83b9f743 100644 --- a/drivers/net/skfp/h/smc.h +++ b/drivers/net/skfp/h/smc.h | |||
| @@ -393,10 +393,10 @@ struct smt_config { | |||
| 393 | */ | 393 | */ |
| 394 | u_long mac_d_max ; /* MAC : D_Max timer value */ | 394 | u_long mac_d_max ; /* MAC : D_Max timer value */ |
| 395 | 395 | ||
| 396 | u_long lct_short ; /* LCT : error threshhold */ | 396 | u_long lct_short ; /* LCT : error threshold */ |
| 397 | u_long lct_medium ; /* LCT : error threshhold */ | 397 | u_long lct_medium ; /* LCT : error threshold */ |
| 398 | u_long lct_long ; /* LCT : error threshhold */ | 398 | u_long lct_long ; /* LCT : error threshold */ |
| 399 | u_long lct_extended ; /* LCT : error threshhold */ | 399 | u_long lct_extended ; /* LCT : error threshold */ |
| 400 | } ; | 400 | } ; |
| 401 | 401 | ||
| 402 | #ifdef DEBUG | 402 | #ifdef DEBUG |