diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/net/smsc911x.h | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
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...) \ |