diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/hp/Kconfig | 31 | ||||
| -rw-r--r-- | drivers/net/ethernet/hp/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/hp/hp100.c (renamed from drivers/net/hp100.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/hp/hp100.h (renamed from drivers/net/hp100.h) | 0 |
9 files changed, 39 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8ca886e34b7..dfa4269fd4d 100644 --- a/MAINTAINERS +++ b/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 <perex@perex.cz> S: Maintained -F: drivers/net/hp100.* +F: drivers/net/ethernet/hp/hp100.* HPET: High Precision Event Timers driver M: Clemens Ladisch <clemens@ladisch.de> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e6e10a475df..39ba7999859 100644 --- a/drivers/net/Kconfig +++ b/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 - <http://www.tldp.org/docs.html#howto>. - - 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/drivers/net/Makefile b/drivers/net/Makefile index 670e17526b5..5b37149a4f7 100644 --- a/drivers/net/Makefile +++ b/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/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 8cd38c91d54..c1ce35670ee 100644 --- a/drivers/net/ethernet/Kconfig +++ b/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/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 50e040c847d..34e84fa3f43 100644 --- a/drivers/net/ethernet/Makefile +++ b/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/drivers/net/ethernet/hp/Kconfig b/drivers/net/ethernet/hp/Kconfig new file mode 100644 index 00000000000..07b42e96314 --- /dev/null +++ b/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 + <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 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 + <http://www.tldp.org/docs.html#howto>. + + To compile this driver as a module, choose M here. The module + will be called hp100. + +endif # NET_VENDOR_HP diff --git a/drivers/net/ethernet/hp/Makefile b/drivers/net/ethernet/hp/Makefile new file mode 100644 index 00000000000..20b6918b52b --- /dev/null +++ b/drivers/net/ethernet/hp/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the HP network device drivers. +# + +obj-$(CONFIG_HP100) += hp100.o diff --git a/drivers/net/hp100.c b/drivers/net/ethernet/hp/hp100.c index b6519c1ba7e..b6519c1ba7e 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/ethernet/hp/hp100.c diff --git a/drivers/net/hp100.h b/drivers/net/ethernet/hp/hp100.h index b60e96fe38b..b60e96fe38b 100644 --- a/drivers/net/hp100.h +++ b/drivers/net/ethernet/hp/hp100.h |