diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/at1700.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/at1700.c')
| -rw-r--r-- | drivers/net/at1700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index f4744fc89768..65a78f965dd2 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
| @@ -133,7 +133,7 @@ struct net_local { | |||
| 133 | /* Run-time register bank 2 definitions. */ | 133 | /* Run-time register bank 2 definitions. */ |
| 134 | #define DATAPORT 8 /* Word-wide DMA or programmed-I/O dataport. */ | 134 | #define DATAPORT 8 /* Word-wide DMA or programmed-I/O dataport. */ |
| 135 | #define TX_START 10 | 135 | #define TX_START 10 |
| 136 | #define COL16CNTL 11 /* Controll Reg for 16 collisions */ | 136 | #define COL16CNTL 11 /* Control Reg for 16 collisions */ |
| 137 | #define MODE13 13 | 137 | #define MODE13 13 |
| 138 | #define RX_CTRL 14 | 138 | #define RX_CTRL 14 |
| 139 | /* Configuration registers only on the '865A/B chips. */ | 139 | /* Configuration registers only on the '865A/B chips. */ |