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: Mark Einon <mark.einon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
739e4a758e
commit
38df6492eb
10
MAINTAINERS
10
MAINTAINERS
|
@ -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: drivers/video/fbdev/s1d13xxxfb.c
|
||||||
F: include/video/s1d13xxxfb.h
|
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
|
ETHERNET BRIDGE
|
||||||
M: Stephen Hemminger <stephen@networkplumber.org>
|
M: Stephen Hemminger <stephen@networkplumber.org>
|
||||||
L: bridge@lists.linux-foundation.org
|
L: bridge@lists.linux-foundation.org
|
||||||
|
@ -8694,11 +8699,6 @@ M: H Hartley Sweeten <hsweeten@visionengravers.com>
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: drivers/staging/comedi/
|
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
|
STAGING - FLARION FT1000 DRIVERS
|
||||||
M: Marek Belisko <marek.belisko@gmail.com>
|
M: Marek Belisko <marek.belisko@gmail.com>
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
|
|
|
@ -20,6 +20,7 @@ config SUNGEM_PHY
|
||||||
source "drivers/net/ethernet/3com/Kconfig"
|
source "drivers/net/ethernet/3com/Kconfig"
|
||||||
source "drivers/net/ethernet/adaptec/Kconfig"
|
source "drivers/net/ethernet/adaptec/Kconfig"
|
||||||
source "drivers/net/ethernet/aeroflex/Kconfig"
|
source "drivers/net/ethernet/aeroflex/Kconfig"
|
||||||
|
source "drivers/net/ethernet/agere/Kconfig"
|
||||||
source "drivers/net/ethernet/allwinner/Kconfig"
|
source "drivers/net/ethernet/allwinner/Kconfig"
|
||||||
source "drivers/net/ethernet/alteon/Kconfig"
|
source "drivers/net/ethernet/alteon/Kconfig"
|
||||||
source "drivers/net/ethernet/altera/Kconfig"
|
source "drivers/net/ethernet/altera/Kconfig"
|
||||||
|
|
|
@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
|
||||||
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
|
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
|
||||||
obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/
|
obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/
|
||||||
obj-$(CONFIG_GRETH) += aeroflex/
|
obj-$(CONFIG_GRETH) += aeroflex/
|
||||||
|
obj-$(CONFIG_NET_VENDOR_AGERE) += agere/
|
||||||
obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/
|
obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/
|
||||||
obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
|
obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
|
||||||
obj-$(CONFIG_ALTERA_TSE) += altera/
|
obj-$(CONFIG_ALTERA_TSE) += altera/
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
#
|
||||||
|
# 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
|
|
@ -0,0 +1,5 @@
|
||||||
|
#
|
||||||
|
# Makefile for the Agere ET-131x ethernet driver
|
||||||
|
#
|
||||||
|
|
||||||
|
obj-$(CONFIG_ET131X) += et131x.o
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -24,8 +24,6 @@ menuconfig STAGING
|
||||||
|
|
||||||
if STAGING
|
if STAGING
|
||||||
|
|
||||||
source "drivers/staging/et131x/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/staging/slicoss/Kconfig"
|
source "drivers/staging/slicoss/Kconfig"
|
||||||
|
|
||||||
source "drivers/staging/wlan-ng/Kconfig"
|
source "drivers/staging/wlan-ng/Kconfig"
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
obj-$(CONFIG_STAGING) += staging.o
|
obj-$(CONFIG_STAGING) += staging.o
|
||||||
|
|
||||||
obj-y += media/
|
obj-y += media/
|
||||||
obj-$(CONFIG_ET131X) += et131x/
|
|
||||||
obj-$(CONFIG_SLICOSS) += slicoss/
|
obj-$(CONFIG_SLICOSS) += slicoss/
|
||||||
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
|
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
|
||||||
obj-$(CONFIG_COMEDI) += comedi/
|
obj-$(CONFIG_COMEDI) += comedi/
|
||||||
|
|
Loading…
Reference in New Issue