diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:17:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:17:27 -0400 |
| commit | 946880fa270c18c137654af70ba939f03181c6b6 (patch) | |
| tree | 1fc66f0f55c17be3026d55fc261f4cbddaf80e90 /drivers/net | |
| parent | 636d17427b1ef0e97bd9df9b3b0e0f314ff889d3 (diff) | |
| parent | 42ea573f872365b0797ddbcee2e1f1f48913f507 (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
IXP4xx: Fix LL debugging on little-endian CPU.
IXP4xx: Fix sparse warnings in I/O primitives.
IXP4xx: Make mdio_bus struct static in the Ethernet driver.
IXP4xx: Fix ixp4xx_crypto little-endian operation.
IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.
ixp4xx/vulcan: add PCI support
ixp4xx: base support for Arcom Vulcan
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 2 | ||||
| -rw-r--r-- | drivers/net/wan/ixp4xx_hss.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 4f1cc7164ad9..6028226a7270 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
| @@ -241,7 +241,7 @@ static inline void memcpy_swab32(u32 *dest, u32 *src, int cnt) | |||
| 241 | 241 | ||
| 242 | static spinlock_t mdio_lock; | 242 | static spinlock_t mdio_lock; |
| 243 | static struct eth_regs __iomem *mdio_regs; /* mdio command and status only */ | 243 | static struct eth_regs __iomem *mdio_regs; /* mdio command and status only */ |
| 244 | struct mii_bus *mdio_bus; | 244 | static struct mii_bus *mdio_bus; |
| 245 | static int ports_open; | 245 | static int ports_open; |
| 246 | static struct port *npe_port_tab[MAX_NPES]; | 246 | static struct port *npe_port_tab[MAX_NPES]; |
| 247 | static struct dma_pool *dma_pool; | 247 | static struct dma_pool *dma_pool; |
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 88e363033e23..6c571e198835 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c | |||
| @@ -396,7 +396,7 @@ static void hss_config(struct port *port) | |||
| 396 | msg.cmd = PORT_CONFIG_WRITE; | 396 | msg.cmd = PORT_CONFIG_WRITE; |
| 397 | msg.hss_port = port->id; | 397 | msg.hss_port = port->id; |
| 398 | msg.index = HSS_CONFIG_TX_PCR; | 398 | msg.index = HSS_CONFIG_TX_PCR; |
| 399 | msg.data32 = PCR_FRM_SYNC_OUTPUT_RISING | PCR_MSB_ENDIAN | | 399 | msg.data32 = PCR_FRM_PULSE_DISABLED | PCR_MSB_ENDIAN | |
| 400 | PCR_TX_DATA_ENABLE | PCR_SOF_NO_FBIT; | 400 | PCR_TX_DATA_ENABLE | PCR_SOF_NO_FBIT; |
| 401 | if (port->clock_type == CLOCK_INT) | 401 | if (port->clock_type == CLOCK_INT) |
| 402 | msg.data32 |= PCR_SYNC_CLK_DIR_OUTPUT; | 402 | msg.data32 |= PCR_SYNC_CLK_DIR_OUTPUT; |