diff options
Diffstat (limited to 'drivers')
| -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 |
8 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index e8e9c166185d..4ded81b27d0a 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 05abebc17804..f8f38dcb5f8a 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 6f1fa4c849a1..333308fe807e 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 a90f9b308c8d..e4943cd63e98 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 fb395cfe6b92..fb395cfe6b92 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 5ed723bb11e2..5ed723bb11e2 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 6ec78f5c602f..6ec78f5c602f 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 7239b94c9de5..7239b94c9de5 100644 --- a/drivers/net/ethernet/hp/hp100.h +++ b/drivers/staging/hp/hp100.h |