Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+37 -12
+1 -1
MAINTAINERS
··· 4785 4785 M: Olof Johansson <olof@lixom.net> 4786 4786 L: netdev@vger.kernel.org 4787 4787 S: Maintained 4788 - F: drivers/net/pasemi_mac.* 4788 + F: drivers/net/ethernet/pasemi/* 4789 4789 4790 4790 PA SEMI SMBUS DRIVER 4791 4791 M: Olof Johansson <olof@lixom.net>
-9
drivers/net/Kconfig
··· 1457 1457 config MDIO 1458 1458 tristate 1459 1459 1460 - config PASEMI_MAC 1461 - tristate "PA Semi 1/10Gbit MAC" 1462 - depends on PPC_PASEMI && PCI && INET 1463 - select PHYLIB 1464 - select INET_LRO 1465 - help 1466 - This driver supports the on-chip 1/10Gbit Ethernet controller on 1467 - PA Semi's PWRficient line of chips. 1468 - 1469 1460 config TEHUTI 1470 1461 tristate "Tehuti Networks 10G Ethernet" 1471 1462 depends on PCI
-2
drivers/net/Makefile
··· 147 147 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o 148 148 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o 149 149 obj-$(CONFIG_DM9000) += dm9000.o 150 - obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o 151 - pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o 152 150 obj-$(CONFIG_ENC28J60) += enc28j60.o 153 151 obj-$(CONFIG_ETHOC) += ethoc.o 154 152 obj-$(CONFIG_GRETH) += greth.o
+1
drivers/net/ethernet/Kconfig
··· 25 25 source "drivers/net/ethernet/i825xx/Kconfig" 26 26 source "drivers/net/ethernet/mellanox/Kconfig" 27 27 source "drivers/net/ethernet/myricom/Kconfig" 28 + source "drivers/net/ethernet/pasemi/Kconfig" 28 29 source "drivers/net/ethernet/qlogic/Kconfig" 29 30 source "drivers/net/ethernet/racal/Kconfig" 30 31 source "drivers/net/ethernet/sfc/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 16 16 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ 17 17 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ 18 18 obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ 19 + obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ 19 20 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ 20 21 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ 21 22 obj-$(CONFIG_SFC) += sfc/
+29
drivers/net/ethernet/pasemi/Kconfig
··· 1 + # 2 + # PA Semi network device configuration 3 + # 4 + 5 + config NET_VENDOR_PASEMI 6 + bool "PA Semi devices" 7 + depends on PPC_PASEMI && PCI && INET 8 + ---help--- 9 + If you have a network (Ethernet) card belonging to this class, say Y 10 + and read the Ethernet-HOWTO, available from 11 + <http://www.tldp.org/docs.html#howto>. 12 + 13 + Note that the answer to this question doesn't directly affect the 14 + kernel: saying N will just cause the configurator to skip all 15 + the questions about PA Semi cards. If you say Y, you will be asked for 16 + your specific card in the following questions. 17 + 18 + if NET_VENDOR_PASEMI 19 + 20 + config PASEMI_MAC 21 + tristate "PA Semi 1/10Gbit MAC" 22 + depends on PPC_PASEMI && PCI && INET 23 + select PHYLIB 24 + select INET_LRO 25 + ---help--- 26 + This driver supports the on-chip 1/10Gbit Ethernet controller on 27 + PA Semi's PWRficient line of chips. 28 + 29 + endif # NET_VENDOR_PASEMI
+5
drivers/net/ethernet/pasemi/Makefile
··· 1 + # 2 + # Makefile for the A Semi network device drivers. 3 + # 4 + 5 + obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
drivers/net/pasemi_mac.c drivers/net/ethernet/pasemi/pasemi_mac.c
drivers/net/pasemi_mac.h drivers/net/ethernet/pasemi/pasemi_mac.h
drivers/net/pasemi_mac_ethtool.c drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c