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

Commit 55faed1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 946e91f3 0edd5b44

drivers/net/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,13 @@ config BNX2 
	  To compile this driver as a module, choose M here: the module

	  will be called bnx2.  This is recommended.



config SPIDER_NET

	tristate "Spider Gigabit Ethernet driver"

	depends on PCI && PPC_BPA

	help

	  This driver supports the Gigabit Ethernet chips present on the

	  Cell Processor-Based Blades from IBM.



config GIANFAR

	tristate "Gianfar Ethernet"

	depends on 85xx || 83xx

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o 
obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_TIGON3) += tg3.o

obj-$(CONFIG_BNX2) += bnx2.o

spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o

obj-$(CONFIG_TC35815) += tc35815.o

obj-$(CONFIG_SKGE) += skge.o

obj-$(CONFIG_SK98LIN) += sk98lin/

drivers/net/ac3200.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev) 
	return 0;

out2:

	if (ei_status.reg0)

		iounmap((void *)dev->mem_start);

		iounmap(ei_status.mem);

out1:

	free_irq(dev->irq, dev);

out:

drivers/net/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ struct lance_private { 
#define	MEM		lp->mem

#define	DREG	IO->data

#define	AREG	IO->addr

#define	REGA(a)	( AREG = (a), DREG )

#define	REGA(a)	(*( AREG = (a), &DREG ))



/* Definitions for packet buffer access: */

#define PKT_BUF_SZ		1544

drivers/net/dm9000.c

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value) 
}



static int

dm9000_drv_suspend(struct device *dev, u32 state, u32 level)

dm9000_drv_suspend(struct device *dev, pm_message_t state, u32 level)

{

	struct net_device *ndev = dev_get_drvdata(dev);