diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 10:15:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 10:15:13 -0700 |
| commit | a319a2773a13bab56a0d0b3744ba8703324313b5 (patch) | |
| tree | f02c86acabd1031439fd422a167784007e84ebb1 /drivers/net/au1000_eth.h | |
| parent | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (diff) | |
| parent | 183798799216fad36c7219fe8d4d6dee6b8fa755 (diff) | |
| download | linux-a319a2773a13bab56a0d0b3744ba8703324313b5.tar.bz2 | |
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/au1000_eth.h')
| -rw-r--r-- | drivers/net/au1000_eth.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/au1000_eth.h b/drivers/net/au1000_eth.h index 41c2f848d2c4..52fe00dd6d24 100644 --- a/drivers/net/au1000_eth.h +++ b/drivers/net/au1000_eth.h @@ -23,7 +23,7 @@ * * ######################################################################## * - * + * */ @@ -40,8 +40,8 @@ #define MULTICAST_FILTER_LIMIT 64 -/* - * Data Buffer Descriptor. Data buffers must be aligned on 32 byte +/* + * Data Buffer Descriptor. Data buffers must be aligned on 32 byte * boundary for both, receive and transmit. */ typedef struct db_dest { @@ -51,7 +51,7 @@ typedef struct db_dest { } db_dest_t; /* - * The transmit and receive descriptors are memory + * The transmit and receive descriptors are memory * mapped registers. */ typedef struct tx_dma { @@ -107,9 +107,9 @@ struct au1000_private { struct phy_device *phy_dev; struct mii_bus mii_bus; - + /* These variables are just for quick access to certain regs addresses. */ - volatile mac_reg_t *mac; /* mac registers */ + volatile mac_reg_t *mac; /* mac registers */ volatile u32 *enable; /* address of MAC Enable Register */ u32 vaddr; /* virtual address of rx/tx buffers */ |