Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7443713a authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b13ad8f4

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -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



#

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/