diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/skfp | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/skfp')
| -rw-r--r-- | drivers/net/skfp/h/smc.h | 8 | ||||
| -rw-r--r-- | drivers/net/skfp/skfddi.c | 2 |
2 files changed, 5 insertions, 5 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 |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index b27156eaf267..db216a728503 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
| @@ -1002,7 +1002,7 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 1002 | } | 1002 | } |
| 1003 | break; | 1003 | break; |
| 1004 | default: | 1004 | default: |
| 1005 | printk("ioctl for %s: unknow cmd: %04x\n", dev->name, ioc.cmd); | 1005 | printk("ioctl for %s: unknown cmd: %04x\n", dev->name, ioc.cmd); |
| 1006 | status = -EOPNOTSUPP; | 1006 | status = -EOPNOTSUPP; |
| 1007 | 1007 | ||
| 1008 | } // switch | 1008 | } // switch |