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

Commit cf10b285 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 14591de1 166c3436

Documentation/networking/bonding.txt

+0 −2
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ bond0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 
          collisions:0 txqueuelen:0



eth0      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4

          inet addr:XXX.XXX.XXX.YYY  Bcast:XXX.XXX.XXX.255  Mask:255.255.252.0

          UP BROADCAST RUNNING SLAVE MULTICAST  MTU:1500  Metric:1

          RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0

          TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0
@@ -953,7 +952,6 @@ eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 
          Interrupt:10 Base address:0x1080



eth1      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4

          inet addr:XXX.XXX.XXX.YYY  Bcast:XXX.XXX.XXX.255  Mask:255.255.252.0

          UP BROADCAST RUNNING SLAVE MULTICAST  MTU:1500  Metric:1

          RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0

          TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1697,7 +1697,6 @@ S: Maintained 


MARVELL MV64340 ETHERNET DRIVER

P:	Manish Lachwani

M:	Manish_Lachwani@pmc-sierra.com

L:	linux-mips@linux-mips.org

L:	netdev@vger.kernel.org

S:	Supported

drivers/net/3c503.c

+8 −8
Original line number Diff line number Diff line
@@ -148,14 +148,6 @@ el2_pio_probe(struct net_device *dev) 
    return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: el2_close() handles free_irq */

	release_region(dev->base_addr, EL2_IO_EXTENT);

	if (ei_status.mem)

		iounmap(ei_status.mem);

}



#ifndef MODULE

struct net_device * __init el2_probe(int unit)

{
@@ -726,6 +718,14 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: el2_close() handles free_irq */

	release_region(dev->base_addr, EL2_IO_EXTENT);

	if (ei_status.mem)

		iounmap(ei_status.mem);

}



void

cleanup_module(void)

{

drivers/net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ config SMC9194 


config DM9000

	tristate "DM9000 support"

	depends on ARM && NET_ETHERNET

	depends on (ARM || MIPS) && NET_ETHERNET

	select CRC32

	select MII

	---help---

drivers/net/ac3200.c

+8 −8
Original line number Diff line number Diff line
@@ -123,14 +123,6 @@ static int __init do_ac3200_probe(struct net_device *dev) 
	return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	/* Someday free_irq may be in ac_close_card() */

	free_irq(dev->irq, dev);

	release_region(dev->base_addr, AC_IO_EXTENT);

	iounmap(ei_status.mem);

}



#ifndef MODULE

struct net_device * __init ac3200_probe(int unit)

{
@@ -406,6 +398,14 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	/* Someday free_irq may be in ac_close_card() */

	free_irq(dev->irq, dev);

	release_region(dev->base_addr, AC_IO_EXTENT);

	iounmap(ei_status.mem);

}



void

cleanup_module(void)

{