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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Olof Johansson <olof@lixom.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index c54e736f5894545eb63c32d09c62992b69e5ce0d..51ac08b14b430494dab64bbc6cb81c6ac1486af2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 08ce280410634a13d0a29de10389a3f9092beeac..69333feb1479128cab97a0c5647d05fab8e9197e 100644 (file)
--- 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 cf1d5a27a4718ac3a3c503345e115cf40e3b463e..5dfa4c37df7931633ca5a49fdf8ade8c0e3d6843 100644 (file)
--- 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 18b634e2750840d81c8eed83e66e95dd69909b0e..16c206e19a3babd3e83e53ae00c484c58e5fbf59 100644 (file)
--- 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 288179b3d0c6033e12b49d5269e8e8d0330cd5c4..a52dc26bd9edcac0f1dd3153db8a6132a449c847 100644 (file)
--- 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 (file)
index 0000000..ccb79b8
--- /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
+         <http://www.tldp.org/docs.html#howto>.
+
+         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 (file)
index 0000000..05db543
--- /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