diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-16 15:02:54 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 12:37:35 -0700 |
| commit | 7443713a31f284365454493a9adbaea02bcc4344 (patch) | |
| tree | 58e4ec1abf2b85a3cb54efe71350ca4f193c2eac | |
| parent | b13ad8f498793dc582b7f42f27b8f44490bd608d (diff) | |
| download | linux-3.10-7443713a31f284365454493a9adbaea02bcc4344.tar.gz linux-3.10-7443713a31f284365454493a9adbaea02bcc4344.tar.bz2 linux-3.10-7443713a31f284365454493a9adbaea02bcc4344.zip | |
ipg: Move the IC Plus driver
Move the IC Plus driver into drivers/net/ethernet/icplus/ and
make the necessary Kconfig and Makefile changes.
CC: <craig_rich@sundanceti.com>
CC: <sorbica@icplus.com.tw>
CC: <jesse@icplus.com.tw>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 10 | ||||
| -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/icplus/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/net/ethernet/icplus/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/icplus/ipg.c (renamed from drivers/net/ipg.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/icplus/ipg.h (renamed from drivers/net/ipg.h) | 0 |
9 files changed, 21 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 37cbe1495c6..879c17ebf38 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3443,7 +3443,7 @@ M: Francois Romieu <romieu@fr.zoreil.com> M: Sorbica Shieh <sorbica@icplus.com.tw> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ipg.* +F: drivers/net/ethernet/icplus/ipg.* IPATH DRIVER M: Mike Marciniszyn <infinipath@qlogic.com> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2607a44a270..bcf7368decd 100644 --- a/drivers/net/Kconfig +++ b/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/drivers/net/Makefile b/drivers/net/Makefile index 4c7af0286cc..2fb039b963f 100644 --- a/drivers/net/Makefile +++ b/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/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 922f4d1243a..72d0f5ef23c 100644 --- a/drivers/net/ethernet/Kconfig +++ b/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/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index fcecd5f474b..a8d8913b305 100644 --- a/drivers/net/ethernet/Makefile +++ b/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/drivers/net/ethernet/icplus/Kconfig b/drivers/net/ethernet/icplus/Kconfig new file mode 100644 index 00000000000..e8882227626 --- /dev/null +++ b/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/drivers/net/ethernet/icplus/Makefile b/drivers/net/ethernet/icplus/Makefile new file mode 100644 index 00000000000..5bc87c1f36a --- /dev/null +++ b/drivers/net/ethernet/icplus/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the IC Plus device drivers +# + +obj-$(CONFIG_IP1000) += ipg.o diff --git a/drivers/net/ipg.c b/drivers/net/ethernet/icplus/ipg.c index b470281158e..b470281158e 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ethernet/icplus/ipg.c diff --git a/drivers/net/ipg.h b/drivers/net/ethernet/icplus/ipg.h index 6ce027355fc..6ce027355fc 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ethernet/icplus/ipg.h |