Commit 8efc9125 authored by Jeff Kirsher's avatar Jeff Kirsher

ni5010: Move the Racal-Interlan (Micom) driver

Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and
make the necessary Kconfig and Makefile changes.

CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
CC: Andreas Mohr <andi@lisas.de>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 628a6048
...@@ -4520,7 +4520,7 @@ M: Jan-Pascal van Best <janpascal@vanbest.org> ...@@ -4520,7 +4520,7 @@ M: Jan-Pascal van Best <janpascal@vanbest.org>
M: Andreas Mohr <andi@lisas.de> M: Andreas Mohr <andi@lisas.de>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: drivers/net/ni5010.* F: drivers/net/ethernet/racal/ni5010.*
NILFS2 FILESYSTEM NILFS2 FILESYSTEM
M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp> M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
......
...@@ -581,31 +581,6 @@ config GRETH ...@@ -581,31 +581,6 @@ config GRETH
help help
Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
config NET_VENDOR_RACAL
bool "Racal-Interlan (Micom) NI cards"
depends on ISA
help
If you have a network (Ethernet) card belonging to this class, such
as the NI5010, 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 NI cards. If you say Y, you will be asked for
your specific card in the following questions.
config NI5010
tristate "NI5010 support (EXPERIMENTAL)"
depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>. Note that this is still
experimental code.
To compile this driver as a module, choose M here. The module
will be called ni5010.
config DNET config DNET
tristate "Dave ethernet support (DNET)" tristate "Dave ethernet support (DNET)"
depends on NET_ETHERNET && HAS_IOMEM depends on NET_ETHERNET && HAS_IOMEM
......
...@@ -140,7 +140,6 @@ obj-$(CONFIG_8139TOO) += 8139too.o ...@@ -140,7 +140,6 @@ obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_CPMAC) += cpmac.o obj-$(CONFIG_CPMAC) += cpmac.o
obj-$(CONFIG_EWRK3) += ewrk3.o obj-$(CONFIG_EWRK3) += ewrk3.o
obj-$(CONFIG_ATP) += atp.o obj-$(CONFIG_ATP) += atp.o
obj-$(CONFIG_NI5010) += ni5010.o
obj-$(CONFIG_SC92031) += sc92031.o obj-$(CONFIG_SC92031) += sc92031.o
obj-$(CONFIG_ETH16I) += eth16i.o obj-$(CONFIG_ETH16I) += eth16i.o
......
...@@ -19,6 +19,7 @@ source "drivers/net/ethernet/chelsio/Kconfig" ...@@ -19,6 +19,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig" source "drivers/net/ethernet/smsc/Kconfig"
endif # ETHERNET endif # ETHERNET
...@@ -10,4 +10,5 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ ...@@ -10,4 +10,5 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
#
# Racal-Interlan device configuration
#
config NET_VENDOR_RACAL
bool "Racal-Interlan (Micom) NI devices"
depends on ISA
---help---
If you have a network (Ethernet) card belonging to this class, such
as the NI5010, NI5210 or NI6210, 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 NI cards. If you say Y, you will be asked for
your specific card in the following questions.
if NET_VENDOR_RACAL
config NI5010
tristate "NI5010 support (EXPERIMENTAL)"
depends on ISA && EXPERIMENTAL && BROKEN_ON_SMP
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
<http://www.tldp.org/docs.html#howto>. Note that this is still
experimental code.
To compile this driver as a module, choose M here. The module
will be called ni5010.
endif # NET_VENDOR_RACAL
#
# Makefile for the Racal-Interlan network device drivers.
#
obj-$(CONFIG_NI5010) += ni5010.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment