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

Commit 2d6a5e95 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/igb/igb_main.c
	drivers/net/qlge/qlge_main.c
	drivers/net/wireless/ath9k/ath9k.h
	drivers/net/wireless/ath9k/core.h
	drivers/net/wireless/ath9k/hw.c
parents bd257ed9 f10023a4

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3888,6 +3888,15 @@ L: linux-ide@vger.kernel.org 
T:	git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git

S:	Supported



SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

P:	Sathya Perla

M:	sathyap@serverengines.com

P:      Subbu Seetharaman

M:      subbus@serverengines.com

L:      netdev@vger.kernel.org

W:      http://www.serverengines.com

S:      Supported



SFC NETWORK DRIVER

P:	Steve Hodgson

P:	Ben Hutchings

drivers/net/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,17 @@ config NI65 
	  To compile this driver as a module, choose M here. The module

	  will be called ni65.



config DNET

	tristate "Dave ethernet support (DNET)"

	depends on NET_ETHERNET

	select PHYLIB

	help

	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.

	  Say Y to include support for the DNET chip.



	  To compile this driver as a module, choose M here: the module

	  will be called dnet.



source "drivers/net/tulip/Kconfig"



config AT1700
@@ -2618,6 +2629,8 @@ config QLGE 


source "drivers/net/sfc/Kconfig"



source "drivers/net/benet/Kconfig"



endif # NETDEV_10000



source "drivers/net/tokenring/Kconfig"

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ obj-$(CONFIG_GIANFAR) += gianfar_driver.o 
obj-$(CONFIG_TEHUTI) += tehuti.o

obj-$(CONFIG_ENIC) += enic/

obj-$(CONFIG_JME) += jme.o

obj-$(CONFIG_BE2NET) += benet/



gianfar_driver-objs := gianfar.o \

		gianfar_ethtool.o \
@@ -232,6 +233,7 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o 


obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o



obj-$(CONFIG_DNET) += dnet.o

obj-$(CONFIG_MACB) += macb.o



obj-$(CONFIG_ARM) += arm/

drivers/net/benet/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config BE2NET

	tristate "ServerEngines' 10Gbps NIC - BladeEngine 2"

	depends on PCI && INET

	select INET_LRO

	help

	This driver implements the NIC functionality for ServerEngines'

	10Gbps network adapter - BladeEngine 2.

drivers/net/benet/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Makefile to build the network driver for ServerEngine's BladeEngine.

#



obj-$(CONFIG_BE2NET) += be2net.o



be2net-y :=  be_main.o be_cmds.o be_ethtool.o