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

hp100: Move the HP driver

Move the HP driver into drivers/net/ethernet/hp/ and
made the necessary Kconfig and Makefile changes.

CC: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

+39 -13
+1 -1
MAINTAINERS
··· 3066 3066 HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series 3067 3067 M: Jaroslav Kysela <perex@perex.cz> 3068 3068 S: Maintained 3069 - F: drivers/net/hp100.* 3069 + F: drivers/net/ethernet/hp/hp100.* 3070 3070 3071 3071 HPET: High Precision Event Timers driver 3072 3072 M: Clemens Ladisch <clemens@ladisch.de>
-11
drivers/net/Kconfig
··· 320 320 To compile this driver as a module, choose M here: the module 321 321 will be called dnet. 322 322 323 - config HP100 324 - tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" 325 - depends on ISA || EISA || PCI 326 - help 327 - If you have a network (Ethernet) card of this type, say Y and read 328 - the Ethernet-HOWTO, available from 329 - <http://www.tldp.org/docs.html#howto>. 330 - 331 - To compile this driver as a module, choose M here. The module 332 - will be called hp100. 333 - 334 323 config NET_PCI 335 324 bool "EISA, VLB, PCI and on board controllers" 336 325 depends on ISA || EISA || PCI
-1
drivers/net/Makefile
··· 26 26 27 27 obj-$(CONFIG_NET) += Space.o loopback.o 28 28 obj-$(CONFIG_NET_SB1000) += sb1000.o 29 - obj-$(CONFIG_HP100) += hp100.o 30 29 31 30 obj-$(CONFIG_PPP) += ppp_generic.o 32 31 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
+1
drivers/net/ethernet/Kconfig
··· 30 30 source "drivers/net/ethernet/faraday/Kconfig" 31 31 source "drivers/net/ethernet/freescale/Kconfig" 32 32 source "drivers/net/ethernet/fujitsu/Kconfig" 33 + source "drivers/net/ethernet/hp/Kconfig" 33 34 source "drivers/net/ethernet/ibm/Kconfig" 34 35 source "drivers/net/ethernet/intel/Kconfig" 35 36 source "drivers/net/ethernet/i825xx/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 22 22 obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/ 23 23 obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/ 24 24 obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/ 25 + obj-$(CONFIG_NET_VENDOR_HP) += hp/ 25 26 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ 26 27 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ 27 28 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
+31
drivers/net/ethernet/hp/Kconfig
··· 1 + # 2 + # HP network device configuration 3 + # 4 + 5 + config NET_VENDOR_HP 6 + bool "HP devices" 7 + depends on ISA || EISA || 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 HP cards. If you say Y, you will be asked for 16 + your specific card in the following questions. 17 + 18 + if NET_VENDOR_HP 19 + 20 + config HP100 21 + tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" 22 + depends on (ISA || EISA || PCI) 23 + ---help--- 24 + If you have a network (Ethernet) card of this type, say Y and read 25 + 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 hp100. 30 + 31 + endif # NET_VENDOR_HP
+5
drivers/net/ethernet/hp/Makefile
··· 1 + # 2 + # Makefile for the HP network device drivers. 3 + # 4 + 5 + obj-$(CONFIG_HP100) += hp100.o
drivers/net/hp100.c drivers/net/ethernet/hp/hp100.c
drivers/net/hp100.h drivers/net/ethernet/hp/hp100.h