diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 13:15:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 13:15:13 -0400 |
| commit | a319a2773a13bab56a0d0b3744ba8703324313b5 (patch) | |
| tree | f02c86acabd1031439fd422a167784007e84ebb1 /drivers/net/sonic.h | |
| parent | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (diff) | |
| parent | 183798799216fad36c7219fe8d4d6dee6b8fa755 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
net/ieee80211: fix more crypto-related build breakage
[PATCH] Spidernet: add ethtool -S (show statistics)
[NET] GT96100: Delete bitrotting ethernet driver
[PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
[PATCH] Cirrus Logic ep93xx ethernet driver
r8169: the MMIO region of the 8167 stands behin BAR#1
e1000, ixgb: Remove pointless wrappers
[PATCH] Remove powerpc specific parts of 3c509 driver
[PATCH] s2io: Switch to pci_get_device
[PATCH] gt96100: move to pci_get_device API
[PATCH] ehea: bugfix for register access functions
[PATCH] e1000 disable device on PCI error
drivers/net/phy/fixed: #if 0 some incomplete code
drivers/net: const-ify ethtool_ops declarations
[PATCH] ethtool: allow const ethtool_ops
[PATCH] sky2: big endian
[PATCH] sky2: fiber support
[PATCH] sky2: tx pause bug fix
drivers/net: Trim trailing whitespace
[PATCH] ehea: IBM eHEA Ethernet Device Driver
...
Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.
Diffstat (limited to 'drivers/net/sonic.h')
| -rw-r--r-- | drivers/net/sonic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sonic.h b/drivers/net/sonic.h index 7f5c4ebcc17a..7f886e8ae28f 100644 --- a/drivers/net/sonic.h +++ b/drivers/net/sonic.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * NOTE: most of the structure definitions here are endian dependent. | 7 | * NOTE: most of the structure definitions here are endian dependent. |
| 8 | * If you want to use this driver on big endian machines, the data | 8 | * If you want to use this driver on big endian machines, the data |
| 9 | * and pad structure members must be exchanged. Also, the structures | 9 | * and pad structure members must be exchanged. Also, the structures |
| 10 | * need to be changed accordingly to the bus size. | 10 | * need to be changed accordingly to the bus size. |
| 11 | * | 11 | * |
| 12 | * 981229 MSch: did just that for the 68k Mac port (32 bit, big endian) | 12 | * 981229 MSch: did just that for the 68k Mac port (32 bit, big endian) |
| 13 | * | 13 | * |
| @@ -181,7 +181,7 @@ | |||
| 181 | 181 | ||
| 182 | #define SONIC_TCR_DEFAULT 0x0000 | 182 | #define SONIC_TCR_DEFAULT 0x0000 |
| 183 | 183 | ||
| 184 | /* | 184 | /* |
| 185 | * Constants for the SONIC_INTERRUPT_MASK and | 185 | * Constants for the SONIC_INTERRUPT_MASK and |
| 186 | * SONIC_INTERRUPT_STATUS registers. | 186 | * SONIC_INTERRUPT_STATUS registers. |
| 187 | */ | 187 | */ |