Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hp100: Move the HP driver

Browse Source 
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>
This commit is contained in:
Jeff Kirsher 2011-07-24 13:19:50 -07:00
parent 9bba23b0ae
commit 7e25d72458
9 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -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>

11
drivers/net/Kconfig
View File

@ -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

1
drivers/net/Makefile
View File

@ -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

1
drivers/net/ethernet/Kconfig
View File

@ -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"

1
drivers/net/ethernet/Makefile
View File

@ -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/

31
drivers/net/ethernet/hp/Kconfig Normal file
View File

@ -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

5
drivers/net/ethernet/hp/Makefile Normal file
View File

@ -0,0 +1,5 @@
#
# Makefile for the HP network device drivers.
#
obj-$(CONFIG_HP100) += hp100.o

0
drivers/net/hp100.c → drivers/net/ethernet/hp/hp100.c
View File

0
drivers/net/hp100.h → drivers/net/ethernet/hp/hp100.h
View File