Skip to content

L
linux-davinci
Commit bfe87dbc authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 23556323 30ecce90
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
drivers/net/forcedeth.c
View file @ bfe87dbc
...@@ -2112,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev) ...@@ -2112,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev)
np->tx_pkts_in_progress--; np->tx_pkts_in_progress--;
if (np->tx_change_owner) { if (np->tx_change_owner) {
__le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen); np->tx_change_owner->first_tx_desc->flaglen |=
flaglen |= NV_TX2_VALID; cpu_to_le32(NV_TX2_VALID);
np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen);
np->tx_pkts_in_progress++; np->tx_pkts_in_progress++;
np->tx_change_owner = np->tx_change_owner->next_tx_ctx; np->tx_change_owner = np->tx_change_owner->next_tx_ctx;
......
drivers/net/phy/marvell.c
View file @ bfe87dbc
...@@ -211,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev) ...@@ -211,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
} }
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) { if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
int temp;
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
if (temp < 0) if (temp < 0)
return temp; return temp;
......
drivers/net/tokenring/olympic.c
View file @ bfe87dbc
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
* Official releases will only have an a.b.c version number format. * Official releases will only have an a.b.c version number format.
*/ */
static char version[] __devinitdata = static char version[] =
"Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ; "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ;
static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion", static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion",
...@@ -290,7 +290,7 @@ op_disable_dev: ...@@ -290,7 +290,7 @@ op_disable_dev:
return i; return i;
} }
static int __devinit olympic_init(struct net_device *dev) static int olympic_init(struct net_device *dev)
{ {
struct olympic_private *olympic_priv; struct olympic_private *olympic_priv;
u8 __iomem *olympic_mmio, *init_srb,*adapter_addr; u8 __iomem *olympic_mmio, *init_srb,*adapter_addr;
...@@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev) ...@@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev)
} }
static int __devinit olympic_open(struct net_device *dev) static int olympic_open(struct net_device *dev)
{ {
struct olympic_private *olympic_priv=netdev_priv(dev); struct olympic_private *olympic_priv=netdev_priv(dev);
u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb; u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment