Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (bfe87dbc) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/forcedeth.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2112,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev)

		np->tx_pkts_in_progress--;
		if (np->tx_change_owner) {
		__le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen);
		flaglen \|= NV_TX2_VALID;
		np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen);
		np->tx_change_owner->first_tx_desc->flaglen \|=
		cpu_to_le32(NV_TX2_VALID);
		np->tx_pkts_in_progress++;

		np->tx_change_owner = np->tx_change_owner->next_tx_ctx;

+0 −2

Original line number	Diff line number	Diff line
		@@ -211,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
		}

		if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
		int temp;

		temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
		if (temp < 0)
		return temp;

+3 −3

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@
		* 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" ;

		static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion",
		@@ -290,7 +290,7 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device
		return i;
		}

		static int __devinit olympic_init(struct net_device *dev)
		static int olympic_init(struct net_device *dev)
		{
		struct olympic_private *olympic_priv;
		u8 __iomem olympic_mmio, init_srb,*adapter_addr;
		@@ -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);
		u8 __iomem olympic_mmio=olympic_priv->olympic_mmio,init_srb;