From 763f95e6e32d385566621adbbdd08ecc8ca2b25e Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 16 Jun 2011 15:02:54 -0700 Subject: [PATCH] --- yaml --- r: 265266 b: refs/heads/master c: 7443713a31f284365454493a9adbaea02bcc4344 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/drivers/net/Kconfig | 10 ---------- trunk/drivers/net/Makefile | 1 - trunk/drivers/net/ethernet/Kconfig | 1 + trunk/drivers/net/ethernet/Makefile | 1 + trunk/drivers/net/ethernet/icplus/Kconfig | 13 +++++++++++++ trunk/drivers/net/ethernet/icplus/Makefile | 5 +++++ trunk/drivers/net/{ => ethernet/icplus}/ipg.c | 0 trunk/drivers/net/{ => ethernet/icplus}/ipg.h | 0 10 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 trunk/drivers/net/ethernet/icplus/Kconfig create mode 100644 trunk/drivers/net/ethernet/icplus/Makefile rename trunk/drivers/net/{ => ethernet/icplus}/ipg.c (100%) rename trunk/drivers/net/{ => ethernet/icplus}/ipg.h (100%) diff --git a/[refs] b/[refs] index ede7a5676c4a..f226cb3babeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b13ad8f498793dc582b7f42f27b8f44490bd608d +refs/heads/master: 7443713a31f284365454493a9adbaea02bcc4344 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 37cbe1495c6e..879c17ebf38a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3443,7 +3443,7 @@ M: Francois Romieu M: Sorbica Shieh L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ipg.* +F: drivers/net/ethernet/icplus/ipg.* IPATH DRIVER M: Mike Marciniszyn diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 2607a44a270f..bcf7368decd9 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -522,16 +522,6 @@ menuconfig NETDEV_1000 if NETDEV_1000 -config IP1000 - tristate "IP1000 Gigabit Ethernet support" - depends on PCI && EXPERIMENTAL - select MII - ---help--- - This driver supports IP1000 gigabit Ethernet cards. - - To compile this driver as a module, choose M here: the module - will be called ipg. This is recommended. - endif # NETDEV_1000 # diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile index 4c7af0286ccf..2fb039b963fb 100644 --- a/trunk/drivers/net/Makefile +++ b/trunk/drivers/net/Makefile @@ -5,7 +5,6 @@ obj-$(CONFIG_MII) += mii.o obj-$(CONFIG_MDIO) += mdio.o obj-$(CONFIG_PHYLIB) += phy/ -obj-$(CONFIG_IP1000) += ipg.o obj-$(CONFIG_CAN) += can/ obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_VMXNET3) += vmxnet3/ diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig index 922f4d1243a6..72d0f5ef23c7 100644 --- a/trunk/drivers/net/ethernet/Kconfig +++ b/trunk/drivers/net/ethernet/Kconfig @@ -31,6 +31,7 @@ source "drivers/net/ethernet/ibm/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/xscale/Kconfig" +source "drivers/net/ethernet/icplus/Kconfig" config JME tristate "JMicron(R) PCI-Express Gigabit Ethernet support" diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile index fcecd5f474b4..a8d8913b3055 100644 --- a/trunk/drivers/net/ethernet/Makefile +++ b/trunk/drivers/net/ethernet/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ +obj-$(CONFIG_IP1000) += icplus/ obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ diff --git a/trunk/drivers/net/ethernet/icplus/Kconfig b/trunk/drivers/net/ethernet/icplus/Kconfig new file mode 100644 index 000000000000..e88822276269 --- /dev/null +++ b/trunk/drivers/net/ethernet/icplus/Kconfig @@ -0,0 +1,13 @@ +# +# IC Plus device configuration +# + +config IP1000 + tristate "IP1000 Gigabit Ethernet support" + depends on PCI && EXPERIMENTAL + select MII + ---help--- + This driver supports IP1000 gigabit Ethernet cards. + + To compile this driver as a module, choose M here: the module + will be called ipg. This is recommended. diff --git a/trunk/drivers/net/ethernet/icplus/Makefile b/trunk/drivers/net/ethernet/icplus/Makefile new file mode 100644 index 000000000000..5bc87c1f36aa --- /dev/null +++ b/trunk/drivers/net/ethernet/icplus/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the IC Plus device drivers +# + +obj-$(CONFIG_IP1000) += ipg.o diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ethernet/icplus/ipg.c similarity index 100% rename from trunk/drivers/net/ipg.c rename to trunk/drivers/net/ethernet/icplus/ipg.c diff --git a/trunk/drivers/net/ipg.h b/trunk/drivers/net/ethernet/icplus/ipg.h similarity index 100% rename from trunk/drivers/net/ipg.h rename to trunk/drivers/net/ethernet/icplus/ipg.h