sfc: Move the Solarflare drivers
Jeff Kirsher [Fri, 13 May 2011 07:17:42 +0000 (00:17 -0700)]
Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
make the necessary Kconfig and Makefile changes.

CC: Steve Hodgson <shodgson@solarflare.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

42 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/sfc/Kconfig [moved from drivers/net/sfc/Kconfig with 96% similarity]
drivers/net/ethernet/sfc/Makefile [moved from drivers/net/sfc/Makefile with 100% similarity]
drivers/net/ethernet/sfc/bitfield.h [moved from drivers/net/sfc/bitfield.h with 100% similarity]
drivers/net/ethernet/sfc/efx.c [moved from drivers/net/sfc/efx.c with 100% similarity]
drivers/net/ethernet/sfc/efx.h [moved from drivers/net/sfc/efx.h with 100% similarity]
drivers/net/ethernet/sfc/enum.h [moved from drivers/net/sfc/enum.h with 100% similarity]
drivers/net/ethernet/sfc/ethtool.c [moved from drivers/net/sfc/ethtool.c with 100% similarity]
drivers/net/ethernet/sfc/falcon.c [moved from drivers/net/sfc/falcon.c with 100% similarity]
drivers/net/ethernet/sfc/falcon_boards.c [moved from drivers/net/sfc/falcon_boards.c with 100% similarity]
drivers/net/ethernet/sfc/falcon_xmac.c [moved from drivers/net/sfc/falcon_xmac.c with 100% similarity]
drivers/net/ethernet/sfc/filter.c [moved from drivers/net/sfc/filter.c with 100% similarity]
drivers/net/ethernet/sfc/filter.h [moved from drivers/net/sfc/filter.h with 100% similarity]
drivers/net/ethernet/sfc/io.h [moved from drivers/net/sfc/io.h with 100% similarity]
drivers/net/ethernet/sfc/mac.h [moved from drivers/net/sfc/mac.h with 100% similarity]
drivers/net/ethernet/sfc/mcdi.c [moved from drivers/net/sfc/mcdi.c with 100% similarity]
drivers/net/ethernet/sfc/mcdi.h [moved from drivers/net/sfc/mcdi.h with 100% similarity]
drivers/net/ethernet/sfc/mcdi_mac.c [moved from drivers/net/sfc/mcdi_mac.c with 100% similarity]
drivers/net/ethernet/sfc/mcdi_pcol.h [moved from drivers/net/sfc/mcdi_pcol.h with 100% similarity]
drivers/net/ethernet/sfc/mcdi_phy.c [moved from drivers/net/sfc/mcdi_phy.c with 100% similarity]
drivers/net/ethernet/sfc/mdio_10g.c [moved from drivers/net/sfc/mdio_10g.c with 100% similarity]
drivers/net/ethernet/sfc/mdio_10g.h [moved from drivers/net/sfc/mdio_10g.h with 100% similarity]
drivers/net/ethernet/sfc/mtd.c [moved from drivers/net/sfc/mtd.c with 100% similarity]
drivers/net/ethernet/sfc/net_driver.h [moved from drivers/net/sfc/net_driver.h with 100% similarity]
drivers/net/ethernet/sfc/nic.c [moved from drivers/net/sfc/nic.c with 100% similarity]
drivers/net/ethernet/sfc/nic.h [moved from drivers/net/sfc/nic.h with 100% similarity]
drivers/net/ethernet/sfc/phy.h [moved from drivers/net/sfc/phy.h with 100% similarity]
drivers/net/ethernet/sfc/qt202x_phy.c [moved from drivers/net/sfc/qt202x_phy.c with 100% similarity]
drivers/net/ethernet/sfc/regs.h [moved from drivers/net/sfc/regs.h with 100% similarity]
drivers/net/ethernet/sfc/rx.c [moved from drivers/net/sfc/rx.c with 100% similarity]
drivers/net/ethernet/sfc/selftest.c [moved from drivers/net/sfc/selftest.c with 100% similarity]
drivers/net/ethernet/sfc/selftest.h [moved from drivers/net/sfc/selftest.h with 100% similarity]
drivers/net/ethernet/sfc/siena.c [moved from drivers/net/sfc/siena.c with 100% similarity]
drivers/net/ethernet/sfc/spi.h [moved from drivers/net/sfc/spi.h with 100% similarity]
drivers/net/ethernet/sfc/tenxpress.c [moved from drivers/net/sfc/tenxpress.c with 100% similarity]
drivers/net/ethernet/sfc/tx.c [moved from drivers/net/sfc/tx.c with 100% similarity]
drivers/net/ethernet/sfc/txc43128_phy.c [moved from drivers/net/sfc/txc43128_phy.c with 100% similarity]
drivers/net/ethernet/sfc/workarounds.h [moved from drivers/net/sfc/workarounds.h with 100% similarity]

index 1cb72da..5a4c875 100644 (file)
@@ -5754,7 +5754,7 @@ M:        Steve Hodgson <shodgson@solarflare.com>
 M:     Ben Hutchings <bhutchings@solarflare.com>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     drivers/net/sfc/
+F:     drivers/net/ethernet/sfc/
 
 SGI GRU DRIVER
 M:     Jack Steiner <steiner@sgi.com>
index 7977002..fe22712 100644 (file)
@@ -1598,8 +1598,6 @@ config BNA
 
          <http://support.brocade.com>
 
-source "drivers/net/sfc/Kconfig"
-
 source "drivers/net/benet/Kconfig"
 
 endif # NETDEV_10000
index cfbb060..faf3068 100644 (file)
@@ -201,7 +201,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
 obj-$(CONFIG_FS_ENET) += fs_enet/
 
 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
-obj-$(CONFIG_SFC) += sfc/
 
 obj-$(CONFIG_WIMAX) += wimax/
 obj-$(CONFIG_CAIF) += caif/
index 5edd237..0bc6635 100644 (file)
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
+source "drivers/net/ethernet/sfc/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
 source "drivers/net/ethernet/sun/Kconfig"
 
index 18d8a89..50faab5 100644 (file)
@@ -11,5 +11,6 @@ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+obj-$(CONFIG_SFC) += sfc/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
similarity index 96%
rename from drivers/net/sfc/Kconfig
rename to drivers/net/ethernet/sfc/Kconfig
index a3d5bb9..5d18841 100644 (file)
@@ -5,7 +5,7 @@ config SFC
        select CRC32
        select I2C
        select I2C_ALGOBIT
-       help
+       ---help---
          This driver supports 10-gigabit Ethernet cards based on
          the Solarflare SFC4000 and SFC9000-family controllers.
 
@@ -15,7 +15,7 @@ config SFC_MTD
        bool "Solarflare SFC4000/SFC9000-family MTD support"
        depends on SFC && MTD && !(SFC=y && MTD=m)
        default y
-       help
+       ---help---
          This exposes the on-board flash memory as MTD devices (e.g.
          /dev/mtd1).  This makes it possible to upload new firmware
          to the NIC.