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

Commit ded19add authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

pasemic_mac*: Move the PA Semi driver 



Move the PA Semi driver into drivers/net/ethernet/pasemi/ and
make the necessary Kconfig and Makefile changes.

CC: Olof Johansson <olof@lixom.net>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
parent e7c379d2

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4785,7 +4785,7 @@ PA SEMI ETHERNET DRIVER 
M:	Olof Johansson <olof@lixom.net>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/pasemi_mac.*

F:	drivers/net/ethernet/pasemi/*



PA SEMI SMBUS DRIVER

M:	Olof Johansson <olof@lixom.net>

drivers/net/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -1457,15 +1457,6 @@ if NETDEV_10000 
config MDIO

	tristate



config PASEMI_MAC

	tristate "PA Semi 1/10Gbit MAC"

	depends on PPC_PASEMI && PCI && INET

	select PHYLIB

	select INET_LRO

	help

	  This driver supports the on-chip 1/10Gbit Ethernet controller on

	  PA Semi's PWRficient line of chips.



config TEHUTI

	tristate "Tehuti Networks 10G Ethernet"

	depends on PCI

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -147,8 +147,6 @@ obj-$(CONFIG_R8169) += r8169.o 
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o

obj-$(CONFIG_BFIN_MAC) += bfin_mac.o

obj-$(CONFIG_DM9000) += dm9000.o

obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o

pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o

obj-$(CONFIG_ENC28J60) += enc28j60.o

obj-$(CONFIG_ETHOC) += ethoc.o

obj-$(CONFIG_GRETH) += greth.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ source "drivers/net/ethernet/intel/Kconfig" 
source "drivers/net/ethernet/i825xx/Kconfig"

source "drivers/net/ethernet/mellanox/Kconfig"

source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

source "drivers/net/ethernet/sfc/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ 
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

obj-$(CONFIG_SFC) += sfc/