net driver updates
Subsystems (3)
PATCH 1/1 net driver updates
Main thing is the ne2k-pci build fix.
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/arm/Kconfig | 8 drivers/net/arm/Makefile | 1 drivers/net/arm/at91_ether.c | 1110 ++++++++++++++++++++++ drivers/net/arm/at91_ether.h | 101 ++ drivers/net/ne2k-pci.c | 2 include/asm-arm/arch-at91rm9200/at91rm9200_emac.h | 138 ++ 6 files changed, 1359 insertions(+), 1 deletion(-)
Andrew Victor:
AT91RM9200 Ethernet driver
Horms:
net: ne2k.c won't compile if pci_clone_list is const
drivers/net/arm/Kconfig +8 -0
@@ -31,3 +31,11 @@ config ARM_ETHERH help If you have an Acorn system with one of these network cards, you should say Y to this option if you wish to use it with Linux. + +config ARM_AT91_ETHER + tristate "AT91RM9200 Ethernet support" + depends on NET_ETHERNET && ARM && ARCH_AT91RM9200 + select MII + help + If you wish to compile a kernel for the AT91RM9200 and enable + ethernet support, then you should always answer Y to this.
drivers/net/arm/Makefile +1 -0
@@ -7,3 +7,4 @@ obj-$(CONFIG_ARM_AM79C961A) += am79c961a obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o +obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
drivers/net/arm/at91_ether.c new file +1110 -0
1,110 lines not on this page · raw message
drivers/net/arm/at91_ether.h new file +101 -0
101 lines not on this page · raw message
drivers/net/ne2k-pci.c +1 -1
@@ -117,7 +117,7 @@ enum ne2k_pci_chipsets { }; -static const struct { +static struct {char *name;int flags; } pci_clone_list[]__devinitdata = {
include/asm-arm/arch-at91rm9200/at91rm9200_emac.h new file +138 -0
138 lines not on this page · raw message