From ded19addf9c937d83b9bfb4d73a836732569041b Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Sun, 15 May 2011 20:56:37 -0700 Subject: [PATCH] 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 Signed-off-by: Jeff Kirsher Acked-by: Olof Johansson --- MAINTAINERS | 2 +- drivers/net/Kconfig | 9 ------ drivers/net/Makefile | 2 -- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/pasemi/Kconfig | 29 +++++++++++++++++++ drivers/net/ethernet/pasemi/Makefile | 5 ++++ .../net/{ => ethernet/pasemi}/pasemi_mac.c | 0 .../net/{ => ethernet/pasemi}/pasemi_mac.h | 0 .../pasemi}/pasemi_mac_ethtool.c | 0 10 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 drivers/net/ethernet/pasemi/Kconfig create mode 100644 drivers/net/ethernet/pasemi/Makefile rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.c (100%) rename drivers/net/{ => ethernet/pasemi}/pasemi_mac.h (100%) rename drivers/net/{ => ethernet/pasemi}/pasemi_mac_ethtool.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index c54e736f5894..51ac08b14b43 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4785,7 +4785,7 @@ PA SEMI ETHERNET DRIVER M: Olof Johansson L: netdev@vger.kernel.org S: Maintained -F: drivers/net/pasemi_mac.* +F: drivers/net/ethernet/pasemi/* PA SEMI SMBUS DRIVER M: Olof Johansson diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 08ce28041063..69333feb1479 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index cf1d5a27a471..5dfa4c37df79 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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 diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 18b634e27508..16c206e19a3b 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 288179b3d0c6..a52dc26bd9ed 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/ethernet/pasemi/Kconfig b/drivers/net/ethernet/pasemi/Kconfig new file mode 100644 index 000000000000..ccb79b8069ad --- /dev/null +++ b/drivers/net/ethernet/pasemi/Kconfig @@ -0,0 +1,29 @@ +# +# PA Semi network device configuration +# + +config NET_VENDOR_PASEMI + bool "PA Semi devices" + depends on PPC_PASEMI && PCI && INET + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + . + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about PA Semi cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_PASEMI + +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. + +endif # NET_VENDOR_PASEMI diff --git a/drivers/net/ethernet/pasemi/Makefile b/drivers/net/ethernet/pasemi/Makefile new file mode 100644 index 000000000000..05db5434bafc --- /dev/null +++ b/drivers/net/ethernet/pasemi/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the A Semi network device drivers. +# + +obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o diff --git a/drivers/net/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c similarity index 100% rename from drivers/net/pasemi_mac.c rename to drivers/net/ethernet/pasemi/pasemi_mac.c diff --git a/drivers/net/pasemi_mac.h b/drivers/net/ethernet/pasemi/pasemi_mac.h similarity index 100% rename from drivers/net/pasemi_mac.h rename to drivers/net/ethernet/pasemi/pasemi_mac.h diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c similarity index 100% rename from drivers/net/pasemi_mac_ethtool.c rename to drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c -- 2.39.5