diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/at1700.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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. */ |