Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (7143b7d4) · Commits · e / devices / android_kernel_fairphone_FP5

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6551,7 +6551,7 @@ S: Maintained
	F: drivers/usb/host/uhci*		F: drivers/usb/host/uhci*

	USB "USBNET" DRIVER FRAMEWORK		USB "USBNET" DRIVER FRAMEWORK
	M: David Brownell <dbrownell@users.sourceforge.net>		M: Oliver Neukum <oneukum@suse.de>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://www.linux-usb.org/usbnet		W: http://www.linux-usb.org/usbnet
	S: Maintained		S: Maintained

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "M
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
	MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);		MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);
	module_param_array(speed_duplex, int, NULL, 0);		module_param_array(speed_duplex, int, NULL, 0);
	MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotitate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");		MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");
	module_param_array(coalesce, bool, NULL, 0);		module_param_array(coalesce, bool, NULL, 0);
	MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0: Disable");		MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0: Disable");
	module_param_array(dynamic_ipg, bool, NULL, 0);		module_param_array(dynamic_ipg, bool, NULL, 0);

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8357,6 +8357,8 @@ bnx2_remove_one(struct pci_dev *pdev)

	unregister_netdev(dev);		unregister_netdev(dev);

			del_timer_sync(&bp->timer);

	if (bp->mips_firmware)		if (bp->mips_firmware)
	release_firmware(bp->mips_firmware);		release_firmware(bp->mips_firmware);
	if (bp->rv2p_firmware)		if (bp->rv2p_firmware)

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -346,10 +346,10 @@ static void sja1000_rx(struct net_device *dev)
	\| (priv->read_reg(priv, REG_ID2) >> 5);		\| (priv->read_reg(priv, REG_ID2) >> 5);
	}		}

			cf->can_dlc = get_can_dlc(fi & 0x0F);
	if (fi & FI_RTR) {		if (fi & FI_RTR) {
	id \|= CAN_RTR_FLAG;		id \|= CAN_RTR_FLAG;
	} else {		} else {
	cf->can_dlc = get_can_dlc(fi & 0x0F);
	for (i = 0; i < cf->can_dlc; i++)		for (i = 0; i < cf->can_dlc; i++)
	cf->data[i] = priv->read_reg(priv, dreg++);		cf->data[i] = priv->read_reg(priv, dreg++);
	}		}

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -139,11 +139,11 @@ static int ftmac100_reset(struct ftmac100 *priv)
	* that hardware reset completed (what the f*ck).		* that hardware reset completed (what the f*ck).
	* We still need to wait for a while.		* We still need to wait for a while.
	*/		*/
	usleep_range(500, 1000);		udelay(500);
	return 0;		return 0;
	}		}

	usleep_range(1000, 10000);		udelay(1000);
	}		}

	netdev_err(netdev, "software reset failed\n");		netdev_err(netdev, "software reset failed\n");
	@@ -772,7 +772,7 @@ static int ftmac100_mdio_read(struct net_device *netdev, int phy_id, int reg)
	if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)		if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)
	return phycr & FTMAC100_PHYCR_MIIRDATA;		return phycr & FTMAC100_PHYCR_MIIRDATA;

	usleep_range(100, 1000);		udelay(100);
	}		}

	netdev_err(netdev, "mdio read timed out\n");		netdev_err(netdev, "mdio read timed out\n");
	@@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device *netdev, int phy_id, int reg,
	if ((phycr & FTMAC100_PHYCR_MIIWR) == 0)		if ((phycr & FTMAC100_PHYCR_MIIWR) == 0)
	return;		return;

	usleep_range(100, 1000);		udelay(100);
	}		}

	netdev_err(netdev, "mdio write timed out\n");		netdev_err(netdev, "mdio write timed out\n");