Commit 69b4b095 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

forcedeth: Move the NVIDIA nForce driver 



Move the nForce driver into drivers/net/ethernet/nvidia/ and make
the necessary Kconfig and Makefile changes.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 15c037d6

drivers/net/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -359,17 +359,6 @@ config ADAPTEC_STARFIRE 
	  To compile this driver as a module, choose M here: the module

	  will be called starfire.  This is recommended.



config FORCEDETH

	tristate "nForce Ethernet support"

	depends on NET_PCI && PCI

	help

	  If you have a network (Ethernet) controller 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 forcedeth.



config NET_POCKET

	bool "Pocket and portable adapters"

	depends on PARPORT

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o 
obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_NET_SB1000) += sb1000.o

obj-$(CONFIG_HP100) += hp100.o

obj-$(CONFIG_FORCEDETH) += forcedeth.o



obj-$(CONFIG_PPP) += ppp_generic.o

obj-$(CONFIG_PPP_ASYNC) += ppp_async.o

drivers/net/ethernet/Kconfig

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

source "drivers/net/ethernet/8390/Kconfig"

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

source "drivers/net/ethernet/nvidia/Kconfig"

source "drivers/net/ethernet/octeon/Kconfig"

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

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

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ 
obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/

obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/

obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/

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

obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/

drivers/net/ethernet/nvidia/Kconfig

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

# NVIDIA network device configuration

#



config NET_VENDOR_NVIDIA

	bool "NVIDIA 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 NVIDIA cards. If you say Y, you will be asked for

	  your specific card in the following questions.



if NET_VENDOR_NVIDIA



config FORCEDETH

	tristate "nForce Ethernet support"

	depends on PCI

	---help---

	  If you have a network (Ethernet) controller 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 forcedeth.



endif # NET_VENDOR_NVIDIA