From 23355331abbf4f208ff0f50b0d4123b350340ce0 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 24 Jul 2011 13:19:50 -0700 Subject: [PATCH] --- yaml --- r: 265276 b: refs/heads/master c: 7e25d72458c64e6ca76d69ae8da9ba98f1bf9d25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/net/Kconfig | 11 -------- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/ethernet/Kconfig | 1 + trunk/drivers/net/ethernet/Makefile | 1 + trunk/drivers/net/ethernet/hp/Kconfig | 31 +++++++++++++++++++++ trunk/drivers/net/ethernet/hp/Makefile | 5 ++++ trunk/drivers/net/{ => ethernet/hp}/hp100.c | 0 trunk/drivers/net/{ => ethernet/hp}/hp100.h | 0 10 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 trunk/drivers/net/ethernet/hp/Kconfig create mode 100644 trunk/drivers/net/ethernet/hp/Makefile rename trunk/drivers/net/{ => ethernet/hp}/hp100.c (100%) rename trunk/drivers/net/{ => ethernet/hp}/hp100.h (100%) diff --git a/[refs] b/[refs] index 15a7e71010fa..3be65cbdd2f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bba23b0ae933a143f8ea89e59c6becf0c1c1d1e +refs/heads/master: 7e25d72458c64e6ca76d69ae8da9ba98f1bf9d25 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8ca886e34b7f..dfa4269fd4d7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3066,7 +3066,7 @@ F: drivers/platform/x86/tc1100-wmi.c HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series M: Jaroslav Kysela S: Maintained -F: drivers/net/hp100.* +F: drivers/net/ethernet/hp/hp100.* HPET: High Precision Event Timers driver M: Clemens Ladisch diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index e6e10a475df3..39ba7999859d 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -320,17 +320,6 @@ config DNET To compile this driver as a module, choose M here: the module will be called dnet. -config HP100 - tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" - depends on ISA || EISA || PCI - help - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called hp100. - config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on ISA || EISA || PCI diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index 670e17526b5f..5b37149a4f7a 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/drivers/net/Makefile @@ -26,7 +26,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_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig index 8cd38c91d549..c1ce35670ee1 100644 --- a/trunk/drivers/net/ethernet/Kconfig +++ b/trunk/drivers/net/ethernet/Kconfig @@ -30,6 +30,7 @@ source "drivers/net/ethernet/neterion/Kconfig" source "drivers/net/ethernet/faraday/Kconfig" source "drivers/net/ethernet/freescale/Kconfig" source "drivers/net/ethernet/fujitsu/Kconfig" +source "drivers/net/ethernet/hp/Kconfig" source "drivers/net/ethernet/ibm/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile index 50e040c847d6..34e84fa3f43e 100644 --- a/trunk/drivers/net/ethernet/Makefile +++ b/trunk/drivers/net/ethernet/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/ obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/ obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/ +obj-$(CONFIG_NET_VENDOR_HP) += hp/ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ diff --git a/trunk/drivers/net/ethernet/hp/Kconfig b/trunk/drivers/net/ethernet/hp/Kconfig new file mode 100644 index 000000000000..07b42e963143 --- /dev/null +++ b/trunk/drivers/net/ethernet/hp/Kconfig @@ -0,0 +1,31 @@ +# +# HP network device configuration +# + +config NET_VENDOR_HP + bool "HP devices" + depends on ISA || EISA || PCI + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + 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 HP cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_HP + +config HP100 + tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" + depends on (ISA || EISA || PCI) + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + . + + To compile this driver as a module, choose M here. The module + will be called hp100. + +endif # NET_VENDOR_HP diff --git a/trunk/drivers/net/ethernet/hp/Makefile b/trunk/drivers/net/ethernet/hp/Makefile new file mode 100644 index 000000000000..20b6918b52bd --- /dev/null +++ b/trunk/drivers/net/ethernet/hp/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the HP network device drivers. +# + +obj-$(CONFIG_HP100) += hp100.o diff --git a/trunk/drivers/net/hp100.c b/trunk/drivers/net/ethernet/hp/hp100.c similarity index 100% rename from trunk/drivers/net/hp100.c rename to trunk/drivers/net/ethernet/hp/hp100.c diff --git a/trunk/drivers/net/hp100.h b/trunk/drivers/net/ethernet/hp/hp100.h similarity index 100% rename from trunk/drivers/net/hp100.h rename to trunk/drivers/net/ethernet/hp/hp100.h