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/ariadne.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/ariadne.h')
| -rw-r--r-- | drivers/net/ariadne.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h index bb613f292e04..727be5cdd1ea 100644 --- a/drivers/net/ariadne.h +++ b/drivers/net/ariadne.h | |||
| @@ -244,7 +244,7 @@ struct Am79C960 { | |||
| 244 | #define DLNKTST 0x0010 /* Disable Link Status */ | 244 | #define DLNKTST 0x0010 /* Disable Link Status */ |
| 245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ | 245 | #define DAPC 0x0008 /* Disable Automatic Polarity Correction */ |
| 246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ | 246 | #define MENDECL 0x0004 /* MENDEC Loopback Mode */ |
| 247 | #define LRTTSEL 0x0002 /* Low Receive Treshold/Transmit Mode Select */ | 247 | #define LRTTSEL 0x0002 /* Low Receive Threshold/Transmit Mode Select */ |
| 248 | #define PORTSEL1 0x0001 /* Port Select Bits */ | 248 | #define PORTSEL1 0x0001 /* Port Select Bits */ |
| 249 | #define PORTSEL2 0x8000 /* Port Select Bits */ | 249 | #define PORTSEL2 0x8000 /* Port Select Bits */ |
| 250 | #define INTL 0x4000 /* Internal Loopback */ | 250 | #define INTL 0x4000 /* Internal Loopback */ |