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/smsc911x.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/smsc911x.h')
| -rw-r--r-- | drivers/net/smsc911x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smsc911x.h b/drivers/net/smsc911x.h index b5716bd8a597..016360c65ce2 100644 --- a/drivers/net/smsc911x.h +++ b/drivers/net/smsc911x.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #define SMSC_NAPI_WEIGHT 16 | 30 | #define SMSC_NAPI_WEIGHT 16 |
| 31 | 31 | ||
| 32 | /* implements a PHY loopback test at initialisation time, to ensure a packet | 32 | /* implements a PHY loopback test at initialisation time, to ensure a packet |
| 33 | * can be succesfully looped back */ | 33 | * can be successfully looped back */ |
| 34 | #define USE_PHY_WORK_AROUND | 34 | #define USE_PHY_WORK_AROUND |
| 35 | 35 | ||
| 36 | #define DPRINTK(nlevel, klevel, fmt, args...) \ | 36 | #define DPRINTK(nlevel, klevel, fmt, args...) \ |