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

Commit 38df6492 authored by Mark Einon's avatar Mark Einon Committed by David S. Miller
Browse files

et131x: Add PCIe gigabit ethernet driver et131x to drivers/net 



This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.

The driver being added has been in the staging tree for some time, and will be
removed from there in a seperate patch. This one merely disables the staging
version to prevent two instances being built.

Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 739e4a75

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -3550,6 +3550,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git 
F:	drivers/video/fbdev/s1d13xxxfb.c

F:	include/video/s1d13xxxfb.h



ET131X NETWORK DRIVER

M:	Mark Einon <mark.einon@gmail.com>

S:	Odd Fixes

F:	drivers/net/ethernet/agere/



ETHERNET BRIDGE

M:	Stephen Hemminger <stephen@networkplumber.org>

L:	bridge@lists.linux-foundation.org
@@ -8694,11 +8699,6 @@ M: H Hartley Sweeten <hsweeten@visionengravers.com> 
S:	Odd Fixes

F:	drivers/staging/comedi/



STAGING - ET131X NETWORK DRIVER

M:	Mark Einon <mark.einon@gmail.com>

S:	Odd Fixes

F:	drivers/staging/et131x/



STAGING - FLARION FT1000 DRIVERS

M:	Marek Belisko <marek.belisko@gmail.com>

S:	Odd Fixes

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config SUNGEM_PHY 
source "drivers/net/ethernet/3com/Kconfig"

source "drivers/net/ethernet/adaptec/Kconfig"

source "drivers/net/ethernet/aeroflex/Kconfig"

source "drivers/net/ethernet/agere/Kconfig"

source "drivers/net/ethernet/allwinner/Kconfig"

source "drivers/net/ethernet/alteon/Kconfig"

source "drivers/net/ethernet/altera/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ 
obj-$(CONFIG_NET_VENDOR_8390) += 8390/

obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/

obj-$(CONFIG_GRETH) += aeroflex/

obj-$(CONFIG_NET_VENDOR_AGERE) += agere/

obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/

obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/

obj-$(CONFIG_ALTERA_TSE) += altera/

drivers/net/ethernet/agere/Kconfig

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

# Agere device configuration

#



config NET_VENDOR_AGERE

	bool "Agere devices"

	default y

	depends on PCI

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about Agere devices. If you say Y, you will be asked

	  for your specific card in the following questions.



if NET_VENDOR_AGERE



config ET131X

	tristate "Agere ET-1310 Gigabit Ethernet support"

	depends on PCI

	select PHYLIB

	---help---

	  This driver supports Agere ET-1310 ethernet adapters.



	  To compile this driver as a module, choose M here. The module

	  will be called et131x.



endif # NET_VENDOR_AGERE

drivers/net/ethernet/agere/Makefile

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

# Makefile for the Agere ET-131x ethernet driver

#



obj-$(CONFIG_ET131X) += et131x.o