diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 15:04:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 15:04:29 -0400 |
| commit | 71d00feca2598c68186ca5b83247746d6a7fed7e (patch) | |
| tree | fe129bfc6a69ea00a43ceffdd04ad91898a0411e /include | |
| parent | 8c1ee54cb3ff750dc39a5e1db8075e2352bbd1b8 (diff) | |
| parent | 19abe86d60eeb34c5deeb3ab2d14229fa9f59157 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
ixgb: fix TX hangs under heavy load
e1000e: Fix typo ! &
ixgbe: minor sparse fixes
e1000: sparse warnings fixes
ixgb: fix sparse warnings
e1000e: fix sparse warnings
mv643xx_eth: Fix MV643XX_ETH offsets used by Pegasos 2
Blackfin EMAC driver: Fix Ethernet communication bug (dupliated and lost packets)
DM9601: Support for ADMtek ADM8515 NIC
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mv643xx_eth.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 8df230a279a0..30e11aa3c1c9 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h | |||
| @@ -8,9 +8,9 @@ | |||
| 8 | #define MV643XX_ETH_NAME "mv643xx_eth" | 8 | #define MV643XX_ETH_NAME "mv643xx_eth" |
| 9 | #define MV643XX_ETH_SHARED_REGS 0x2000 | 9 | #define MV643XX_ETH_SHARED_REGS 0x2000 |
| 10 | #define MV643XX_ETH_SHARED_REGS_SIZE 0x2000 | 10 | #define MV643XX_ETH_SHARED_REGS_SIZE 0x2000 |
| 11 | #define MV643XX_ETH_BAR_4 0x220 | 11 | #define MV643XX_ETH_BAR_4 0x2220 |
| 12 | #define MV643XX_ETH_SIZE_REG_4 0x224 | 12 | #define MV643XX_ETH_SIZE_REG_4 0x2224 |
| 13 | #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x0290 | 13 | #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 |
| 14 | 14 | ||
| 15 | struct mv643xx_eth_platform_data { | 15 | struct mv643xx_eth_platform_data { |
| 16 | int port_number; | 16 | int port_number; |