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

Commit 554f4ffd authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

hamachi/yellowfin: Move the packet engine drivers 



Move the packet engine drivers to drivers/net/ethernet/packetengines/
and the necessary Kconfig and Makefile changes.

CC: Donald Becker <becker@scyld.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b544dbac

drivers/net/Kconfig

+0 −26
Original line number Diff line number Diff line
@@ -541,32 +541,6 @@ config IP1000 
	  To compile this driver as a module, choose M here: the module

	  will be called ipg.  This is recommended.



config HAMACHI

	tristate "Packet Engines Hamachi GNIC-II support"

	depends on PCI

	select MII

	help

	  If you have a Gigabit Ethernet card of this type, say Y and read

	  the Ethernet-HOWTO, available from

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



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

	  called hamachi.



config YELLOWFIN

	tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	select CRC32

	---help---

	  Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet

	  adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is

	  used by the Beowulf Linux cluster project.  See

	  <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more

	  information about this driver in particular and Beowulf in general.



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

	  will be called yellowfin.  This is recommended.



config XILINX_LL_TEMAC

	tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"

	depends on PPC || MICROBLAZE

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ obj-$(CONFIG_PLIP) += plip.o 
obj-$(CONFIG_ROADRUNNER) += rrunner.o



obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
@@ -30,7 +29,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o 
# end link order section

#



obj-$(CONFIG_HAMACHI) += hamachi.o

obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_NET_SB1000) += sb1000.o

obj-$(CONFIG_HP100) += hp100.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ source "drivers/net/ethernet/natsemi/Kconfig" 
source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/nuvoton/Kconfig"

source "drivers/net/ethernet/oki-semi/Kconfig"

source "drivers/net/ethernet/packetengines/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ 
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/

obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/

obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

drivers/net/ethernet/packetengines/Kconfig

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

# Packet engine device configuration

#



config NET_PACKET_ENGINE

	bool "Packet Engine devices"

	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 packet engine devices. If you say Y, you will

	  be asked for your specific card in the following questions.



if NET_PACKET_ENGINE



config HAMACHI

	tristate "Packet Engines Hamachi GNIC-II support"

	depends on PCI

	select MII

	---help---

	  If you have a Gigabit Ethernet card of this type, say Y and read

	  the Ethernet-HOWTO, available from

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



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

	  called hamachi.



config YELLOWFIN

	tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	select CRC32

	---help---

	  Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet

	  adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is

	  used by the Beowulf Linux cluster project.  See

	  <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more

	  information about this driver in particular and Beowulf in general.



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

	  will be called yellowfin.  This is recommended.



endif # NET_PACKET_ENGINE