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

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

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

Conflicts:
	drivers/net/forcedeth.c
parents d455e5b1 12186be7

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1545,6 +1545,13 @@ W: http://www.fi.muni.cz/~kas/cosa/ 
S:	Maintained

F:	drivers/net/wan/cosa*



CPMAC ETHERNET DRIVER

P:	Florian Fainelli

M:	florian@openwrt.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/cpmac.c



CPU FREQUENCY DRIVERS

P:	Dave Jones

M:	davej@redhat.com

drivers/net/3c509.c

+4 −0
Original line number Diff line number Diff line
@@ -480,9 +480,13 @@ static int pnp_registered; 


#ifdef CONFIG_EISA

static struct eisa_device_id el3_eisa_ids[] = {

		{ "TCM5090" },

		{ "TCM5091" },

		{ "TCM5092" },

		{ "TCM5093" },

		{ "TCM5094" },

		{ "TCM5095" },

		{ "TCM5098" },

		{ "" }

};

MODULE_DEVICE_TABLE(eisa, el3_eisa_ids);

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ obj-$(CONFIG_HAMACHI) += hamachi.o 
obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_SEEQ8005) += seeq8005.o

obj-$(CONFIG_NET_SB1000) += sb1000.o

obj-$(CONFIG_MAC8390) += mac8390.o 8390.o

obj-$(CONFIG_MAC8390) += mac8390.o

obj-$(CONFIG_APNE) += apne.o 8390.o

obj-$(CONFIG_PCMCIA_PCNET) += 8390.o

obj-$(CONFIG_HP100) += hp100.o

drivers/net/atl1e/atl1e_main.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ char atl1e_driver_version[] = DRV_VERSION; 
 */

static struct pci_device_id atl1e_pci_tbl[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATTANSIC_L1E)},

	{PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, 0x1066)},

	/* required last entry */

	{ 0 }

};

drivers/net/atlx/atl1.c

+6 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ 


#include "atl1.h"



#define ATLX_DRIVER_VERSION "2.1.3"

MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \

	Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>");

MODULE_LICENSE("GPL");

MODULE_VERSION(ATLX_DRIVER_VERSION);



/* Temporary hack for merging atl1 and atl2 */

#include "atlx.c"