diff options
| author | Joe Perches <joe@perches.com> | 2019-10-31 11:23:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-31 14:49:52 -0700 |
| commit | 52340b82cf1a9c8d466b6e36a0881bc44174b969 (patch) | |
| tree | 518e536aafe2ce98f858d4cf4dfaa1711fc86651 | |
| parent | 44715423dd018e01ff31b73b130d362e95a6c59c (diff) | |
hp100: Move 100BaseVG AnyLAN driver to staging
100BaseVG AnyLAN hasn't been useful since 1996 or so and even then
didn't sell many devices. It's unlikely any are still in use.
Move the driver to staging with the intent of removing it altogether
one day.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/hp/Kconfig (renamed from drivers/net/ethernet/hp/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/hp/Makefile (renamed from drivers/net/ethernet/hp/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/hp/hp100.c (renamed from drivers/net/ethernet/hp/hp100.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/hp/hp100.h (renamed from drivers/net/ethernet/hp/hp100.h) | 0 |
9 files changed, 5 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 29406ac2626c1..fb9e7d9d11b7d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7454,8 +7454,8 @@ 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/ethernet/hp/hp100.* +S: Obsolete +F: drivers/staging/hp/hp100.* HPET: High Precision Event Timers driver M: Clemens Ladisch <clemens@ladisch.de> diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index e8e9c166185de..4ded81b27d0a0 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -78,7 +78,6 @@ source "drivers/net/ethernet/freescale/Kconfig" source "drivers/net/ethernet/fujitsu/Kconfig" source "drivers/net/ethernet/google/Kconfig" source "drivers/net/ethernet/hisilicon/Kconfig" -source "drivers/net/ethernet/hp/Kconfig" source "drivers/net/ethernet/huawei/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/ibm/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 05abebc17804f..f8f38dcb5f8a0 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -41,7 +41,6 @@ obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/ obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/ obj-$(CONFIG_NET_VENDOR_GOOGLE) += google/ obj-$(CONFIG_NET_VENDOR_HISILICON) += hisilicon/ -obj-$(CONFIG_NET_VENDOR_HP) += hp/ obj-$(CONFIG_NET_VENDOR_HUAWEI) += huawei/ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 6f1fa4c849a16..333308fe807ef 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -125,4 +125,6 @@ source "drivers/staging/exfat/Kconfig" source "drivers/staging/qlge/Kconfig" +source "drivers/staging/hp/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index a90f9b308c8de..e4943cd63e986 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -53,3 +53,4 @@ obj-$(CONFIG_UWB) += uwb/ obj-$(CONFIG_USB_WUSB) += wusbcore/ obj-$(CONFIG_EXFAT_FS) += exfat/ obj-$(CONFIG_QLGE) += qlge/ +obj-$(CONFIG_NET_VENDOR_HP) += hp/ diff --git a/drivers/net/ethernet/hp/Kconfig b/drivers/staging/hp/Kconfig index fb395cfe6b927..fb395cfe6b927 100644 --- a/drivers/net/ethernet/hp/Kconfig +++ b/drivers/staging/hp/Kconfig diff --git a/drivers/net/ethernet/hp/Makefile b/drivers/staging/hp/Makefile index 5ed723bb11e23..5ed723bb11e23 100644 --- a/drivers/net/ethernet/hp/Makefile +++ b/drivers/staging/hp/Makefile diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/staging/hp/hp100.c index 6ec78f5c602f6..6ec78f5c602f6 100644 --- a/drivers/net/ethernet/hp/hp100.c +++ b/drivers/staging/hp/hp100.c diff --git a/drivers/net/ethernet/hp/hp100.h b/drivers/staging/hp/hp100.h index 7239b94c9de57..7239b94c9de57 100644 --- a/drivers/net/ethernet/hp/hp100.h +++ b/drivers/staging/hp/hp100.h |