tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Jeff Kirsher 69b4b095 15c037d6

+38 -12
-11
drivers/net/Kconfig
··· 359 359 To compile this driver as a module, choose M here: the module 360 360 will be called starfire. This is recommended. 361 361 362 - config FORCEDETH 363 - tristate "nForce Ethernet support" 364 - depends on NET_PCI && PCI 365 - help 366 - If you have a network (Ethernet) controller of this type, say Y and 367 - read the Ethernet-HOWTO, available from 368 - <http://www.tldp.org/docs.html#howto>. 369 - 370 - To compile this driver as a module, choose M here. The module 371 - will be called forcedeth. 372 - 373 362 config NET_POCKET 374 363 bool "Pocket and portable adapters" 375 364 depends on PARPORT
-1
drivers/net/Makefile
··· 28 28 obj-$(CONFIG_NET) += Space.o loopback.o 29 29 obj-$(CONFIG_NET_SB1000) += sb1000.o 30 30 obj-$(CONFIG_HP100) += hp100.o 31 - obj-$(CONFIG_FORCEDETH) += forcedeth.o 32 31 33 32 obj-$(CONFIG_PPP) += ppp_generic.o 34 33 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
+1
drivers/net/ethernet/Kconfig
··· 86 86 source "drivers/net/ethernet/natsemi/Kconfig" 87 87 source "drivers/net/ethernet/8390/Kconfig" 88 88 source "drivers/net/ethernet/nuvoton/Kconfig" 89 + source "drivers/net/ethernet/nvidia/Kconfig" 89 90 source "drivers/net/ethernet/octeon/Kconfig" 90 91 source "drivers/net/ethernet/oki-semi/Kconfig" 91 92 source "drivers/net/ethernet/packetengines/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 37 37 obj-$(CONFIG_FEALNX) += fealnx.o 38 38 obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ 39 39 obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/ 40 + obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/ 40 41 obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ 41 42 obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/ 42 43 obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
+31
drivers/net/ethernet/nvidia/Kconfig
··· 1 + # 2 + # NVIDIA network device configuration 3 + # 4 + 5 + config NET_VENDOR_NVIDIA 6 + bool "NVIDIA devices" 7 + depends on PCI 8 + ---help--- 9 + If you have a network (Ethernet) card belonging to this class, say Y 10 + and read the Ethernet-HOWTO, available from 11 + <http://www.tldp.org/docs.html#howto>. 12 + 13 + Note that the answer to this question doesn't directly affect the 14 + kernel: saying N will just cause the configurator to skip all 15 + the questions about NVIDIA cards. If you say Y, you will be asked for 16 + your specific card in the following questions. 17 + 18 + if NET_VENDOR_NVIDIA 19 + 20 + config FORCEDETH 21 + tristate "nForce Ethernet support" 22 + depends on PCI 23 + ---help--- 24 + If you have a network (Ethernet) controller of this type, say Y and 25 + read the Ethernet-HOWTO, available from 26 + <http://www.tldp.org/docs.html#howto>. 27 + 28 + To compile this driver as a module, choose M here. The module 29 + will be called forcedeth. 30 + 31 + endif # NET_VENDOR_NVIDIA
+5
drivers/net/ethernet/nvidia/Makefile
··· 1 + # 2 + # Makefile for the NVIDIA network device drivers. 3 + # 4 + 5 + obj-$(CONFIG_FORCEDETH) += forcedeth.o
drivers/net/forcedeth.c drivers/net/ethernet/nvidia/forcedeth.c