Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 030352a9 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents e6e30add 0c1aa20f

drivers/net/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -524,6 +524,18 @@ config STNIC 


	  If unsure, say N.



config SH_ETH

	tristate "Renesas SuperH Ethernet support"

	depends on SUPERH && \

		(CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712)

	select CRC32

	select MII

	select MDIO_BITBANG

	select PHYLIB

	help

	  Renesas SuperH Ethernet device driver.

	  This driver support SH7710 and SH7712.



config SUNLANCE

	tristate "Sun LANCE support"

	depends on SBUS
@@ -955,7 +967,7 @@ config SMC911X 
	tristate "SMSC LAN911[5678] support"

	select CRC32

	select MII

	depends on ARCH_PXA || SH_MAGIC_PANEL_R2

	depends on ARCH_PXA || SUPERH

	help

	  This is a driver for SMSC's LAN911x series of Ethernet chipsets

	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ obj-$(CONFIG_VIA_RHINE) += via-rhine.o 
obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_SH_ETH) += sh_eth.o



#

# end link order section
@@ -236,6 +237,7 @@ obj-$(CONFIG_USB_CATC) += usb/ 
obj-$(CONFIG_USB_KAWETH)        += usb/

obj-$(CONFIG_USB_PEGASUS)       += usb/

obj-$(CONFIG_USB_RTL8150)       += usb/

obj-$(CONFIG_USB_HSO)		+= usb/

obj-$(CONFIG_USB_USBNET)        += usb/

obj-$(CONFIG_USB_ZD1201)        += usb/

drivers/net/a2065.c

+0 −4
Original line number Diff line number Diff line
@@ -475,16 +475,12 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id) 
	return IRQ_HANDLED;

}



struct net_device *last_dev;



static int lance_open (struct net_device *dev)

{

	struct lance_private *lp = netdev_priv(dev);

	volatile struct lance_regs *ll = lp->ll;

	int ret;



	last_dev = dev;



	/* Stop the Lance */

	ll->rap = LE_CSR0;

	ll->rdp = LE_C0_STOP;

drivers/net/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ struct lance_private { 


/* Possible memory/IO addresses for probing */



struct lance_addr {

static struct lance_addr {

	unsigned long	memaddr;

	unsigned long	ioaddr;

	int				slow_flag;

drivers/net/declance.c

+0 −4
Original line number Diff line number Diff line
@@ -773,8 +773,6 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



struct net_device *last_dev = 0;



static int lance_open(struct net_device *dev)

{

	volatile u16 *ib = (volatile u16 *)dev->mem_start;
@@ -782,8 +780,6 @@ static int lance_open(struct net_device *dev) 
	volatile struct lance_regs *ll = lp->ll;

	int status = 0;



	last_dev = dev;



	/* Stop the Lance */

	writereg(&ll->rap, LE_CSR0);

	writereg(&ll->rdp, LE_C0_STOP);