diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/net/au1000_eth.h | |
parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/au1000_eth.h')
-rw-r--r-- | drivers/net/au1000_eth.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/au1000_eth.h b/drivers/net/au1000_eth.h index f9d29a29b8fd..d06ec008fbf1 100644 --- a/drivers/net/au1000_eth.h +++ b/drivers/net/au1000_eth.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #define NUM_TX_BUFFS 4 | 35 | #define NUM_TX_BUFFS 4 |
36 | #define MAX_BUF_SIZE 2048 | 36 | #define MAX_BUF_SIZE 2048 |
37 | 37 | ||
38 | #define ETH_TX_TIMEOUT HZ/4 | 38 | #define ETH_TX_TIMEOUT (HZ/4) |
39 | #define MAC_MIN_PKT_SIZE 64 | 39 | #define MAC_MIN_PKT_SIZE 64 |
40 | 40 | ||
41 | #define MULTICAST_FILTER_LIMIT 64 | 41 | #define MULTICAST_FILTER_LIMIT 64 |
@@ -125,4 +125,6 @@ struct au1000_private { | |||
125 | dma_addr_t dma_addr; /* dma address of rx/tx buffers */ | 125 | dma_addr_t dma_addr; /* dma address of rx/tx buffers */ |
126 | 126 | ||
127 | spinlock_t lock; /* Serialise access to device */ | 127 | spinlock_t lock; /* Serialise access to device */ |
128 | |||
129 | u32 msg_enable; | ||
128 | }; | 130 | }; |