diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-13 09:17:42 +0200 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 11:33:50 +0200 |
commit | 874aeea5d01cac55c160a4e503e3ddb4db030de7 (patch) | |
tree | 2ec67fc737ebc853d954b914a70098ece1ded19b /drivers | |
parent | cassini/niu/sun*: Move the Sun drivers (diff) | |
download | linux-874aeea5d01cac55c160a4e503e3ddb4db030de7.tar.xz linux-874aeea5d01cac55c160a4e503e3ddb4db030de7.zip |
sfc: Move the Solarflare drivers
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/Kconfig (renamed from drivers/net/sfc/Kconfig) | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/Makefile (renamed from drivers/net/sfc/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/bitfield.h (renamed from drivers/net/sfc/bitfield.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/efx.c (renamed from drivers/net/sfc/efx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/efx.h (renamed from drivers/net/sfc/efx.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/enum.h (renamed from drivers/net/sfc/enum.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/ethtool.c (renamed from drivers/net/sfc/ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/falcon.c (renamed from drivers/net/sfc/falcon.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/falcon_boards.c (renamed from drivers/net/sfc/falcon_boards.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/falcon_xmac.c (renamed from drivers/net/sfc/falcon_xmac.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/filter.c (renamed from drivers/net/sfc/filter.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/filter.h (renamed from drivers/net/sfc/filter.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/io.h (renamed from drivers/net/sfc/io.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mac.h (renamed from drivers/net/sfc/mac.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi.c (renamed from drivers/net/sfc/mcdi.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi.h (renamed from drivers/net/sfc/mcdi.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi_mac.c (renamed from drivers/net/sfc/mcdi_mac.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi_pcol.h (renamed from drivers/net/sfc/mcdi_pcol.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi_phy.c (renamed from drivers/net/sfc/mcdi_phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mdio_10g.c (renamed from drivers/net/sfc/mdio_10g.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mdio_10g.h (renamed from drivers/net/sfc/mdio_10g.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mtd.c (renamed from drivers/net/sfc/mtd.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/net_driver.h (renamed from drivers/net/sfc/net_driver.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/nic.c (renamed from drivers/net/sfc/nic.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/nic.h (renamed from drivers/net/sfc/nic.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/phy.h (renamed from drivers/net/sfc/phy.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/qt202x_phy.c (renamed from drivers/net/sfc/qt202x_phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/regs.h (renamed from drivers/net/sfc/regs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/rx.c (renamed from drivers/net/sfc/rx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/selftest.c (renamed from drivers/net/sfc/selftest.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/selftest.h (renamed from drivers/net/sfc/selftest.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/siena.c (renamed from drivers/net/sfc/siena.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/spi.h (renamed from drivers/net/sfc/spi.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/tenxpress.c (renamed from drivers/net/sfc/tenxpress.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/tx.c (renamed from drivers/net/sfc/tx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/txc43128_phy.c (renamed from drivers/net/sfc/txc43128_phy.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/workarounds.h (renamed from drivers/net/sfc/workarounds.h) | 0 |
41 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7977002fc81d..fe227123a5f6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1598,8 +1598,6 @@ config BNA <http://support.brocade.com> -source "drivers/net/sfc/Kconfig" - source "drivers/net/benet/Kconfig" endif # NETDEV_10000 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index cfbb060c0c69..faf306865cbd 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 5edd2371c53f..0bc6635b071b 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 18d8a893d78b..50faab53b95b 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index a3d5bb9e39dc..5d18841f0f3d 100644 --- a/drivers/net/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -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. diff --git a/drivers/net/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile index ab31c7124db1..ab31c7124db1 100644 --- a/drivers/net/sfc/Makefile +++ b/drivers/net/ethernet/sfc/Makefile diff --git a/drivers/net/sfc/bitfield.h b/drivers/net/ethernet/sfc/bitfield.h index 098ac2ad757d..098ac2ad757d 100644 --- a/drivers/net/sfc/bitfield.h +++ b/drivers/net/ethernet/sfc/bitfield.h diff --git a/drivers/net/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index faca764aa21b..faca764aa21b 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c diff --git a/drivers/net/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h index b0d1209ea18d..b0d1209ea18d 100644 --- a/drivers/net/sfc/efx.h +++ b/drivers/net/ethernet/sfc/efx.h diff --git a/drivers/net/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h index d725a8fbe1a6..d725a8fbe1a6 100644 --- a/drivers/net/sfc/enum.h +++ b/drivers/net/ethernet/sfc/enum.h diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index bc4643af6dd1..bc4643af6dd1 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c diff --git a/drivers/net/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c index 94bf4aaf984d..94bf4aaf984d 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/ethernet/sfc/falcon.c diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/ethernet/sfc/falcon_boards.c index b9cc846811d6..b9cc846811d6 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/ethernet/sfc/falcon_boards.c diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/ethernet/sfc/falcon_xmac.c index 9516452c079c..9516452c079c 100644 --- a/drivers/net/sfc/falcon_xmac.c +++ b/drivers/net/ethernet/sfc/falcon_xmac.c diff --git a/drivers/net/sfc/filter.c b/drivers/net/ethernet/sfc/filter.c index 2b9636f96e05..2b9636f96e05 100644 --- a/drivers/net/sfc/filter.c +++ b/drivers/net/ethernet/sfc/filter.c diff --git a/drivers/net/sfc/filter.h b/drivers/net/ethernet/sfc/filter.h index 872f2132a496..872f2132a496 100644 --- a/drivers/net/sfc/filter.h +++ b/drivers/net/ethernet/sfc/filter.h diff --git a/drivers/net/sfc/io.h b/drivers/net/ethernet/sfc/io.h index cc978803d484..cc978803d484 100644 --- a/drivers/net/sfc/io.h +++ b/drivers/net/ethernet/sfc/io.h diff --git a/drivers/net/sfc/mac.h b/drivers/net/ethernet/sfc/mac.h index d6a255d0856b..d6a255d0856b 100644 --- a/drivers/net/sfc/mac.h +++ b/drivers/net/ethernet/sfc/mac.h diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c index 3dd45ed61f0a..3dd45ed61f0a 100644 --- a/drivers/net/sfc/mcdi.c +++ b/drivers/net/ethernet/sfc/mcdi.c diff --git a/drivers/net/sfc/mcdi.h b/drivers/net/ethernet/sfc/mcdi.h index aced2a7856fc..aced2a7856fc 100644 --- a/drivers/net/sfc/mcdi.h +++ b/drivers/net/ethernet/sfc/mcdi.h diff --git a/drivers/net/sfc/mcdi_mac.c b/drivers/net/ethernet/sfc/mcdi_mac.c index 50c20777a564..50c20777a564 100644 --- a/drivers/net/sfc/mcdi_mac.c +++ b/drivers/net/ethernet/sfc/mcdi_mac.c diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h index 41fe06fa0600..41fe06fa0600 100644 --- a/drivers/net/sfc/mcdi_pcol.h +++ b/drivers/net/ethernet/sfc/mcdi_pcol.h diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/ethernet/sfc/mcdi_phy.c index 6c63ab0710af..6c63ab0710af 100644 --- a/drivers/net/sfc/mcdi_phy.c +++ b/drivers/net/ethernet/sfc/mcdi_phy.c diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/ethernet/sfc/mdio_10g.c index 7ab385c8136d..7ab385c8136d 100644 --- a/drivers/net/sfc/mdio_10g.c +++ b/drivers/net/ethernet/sfc/mdio_10g.c diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/ethernet/sfc/mdio_10g.h index a97dbbd2de99..a97dbbd2de99 100644 --- a/drivers/net/sfc/mdio_10g.h +++ b/drivers/net/ethernet/sfc/mdio_10g.h diff --git a/drivers/net/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c index b6304486f244..b6304486f244 100644 --- a/drivers/net/sfc/mtd.c +++ b/drivers/net/ethernet/sfc/mtd.c diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index b8e251a1ee48..b8e251a1ee48 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h diff --git a/drivers/net/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c index bafa23a6874c..bafa23a6874c 100644 --- a/drivers/net/sfc/nic.c +++ b/drivers/net/ethernet/sfc/nic.c diff --git a/drivers/net/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h index 4bd1f2839dfe..4bd1f2839dfe 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/ethernet/sfc/nic.h diff --git a/drivers/net/sfc/phy.h b/drivers/net/ethernet/sfc/phy.h index 11d148cd8441..11d148cd8441 100644 --- a/drivers/net/sfc/phy.h +++ b/drivers/net/ethernet/sfc/phy.h diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/ethernet/sfc/qt202x_phy.c index 7ad97e397406..7ad97e397406 100644 --- a/drivers/net/sfc/qt202x_phy.c +++ b/drivers/net/ethernet/sfc/qt202x_phy.c diff --git a/drivers/net/sfc/regs.h b/drivers/net/ethernet/sfc/regs.h index cc2c86b76a7b..cc2c86b76a7b 100644 --- a/drivers/net/sfc/regs.h +++ b/drivers/net/ethernet/sfc/regs.h diff --git a/drivers/net/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index 62e43649466e..62e43649466e 100644 --- a/drivers/net/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c diff --git a/drivers/net/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c index 822f6c2a6a7c..822f6c2a6a7c 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/ethernet/sfc/selftest.c diff --git a/drivers/net/sfc/selftest.h b/drivers/net/ethernet/sfc/selftest.h index dba5456e70f3..dba5456e70f3 100644 --- a/drivers/net/sfc/selftest.h +++ b/drivers/net/ethernet/sfc/selftest.h diff --git a/drivers/net/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index 5735e84c69de..5735e84c69de 100644 --- a/drivers/net/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c diff --git a/drivers/net/sfc/spi.h b/drivers/net/ethernet/sfc/spi.h index 71f2e3ebe1c7..71f2e3ebe1c7 100644 --- a/drivers/net/sfc/spi.h +++ b/drivers/net/ethernet/sfc/spi.h diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/ethernet/sfc/tenxpress.c index 7b0fd89e7b85..7b0fd89e7b85 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/ethernet/sfc/tenxpress.c diff --git a/drivers/net/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c index 84eb99e0f8d2..84eb99e0f8d2 100644 --- a/drivers/net/sfc/tx.c +++ b/drivers/net/ethernet/sfc/tx.c diff --git a/drivers/net/sfc/txc43128_phy.c b/drivers/net/ethernet/sfc/txc43128_phy.c index 7c21b334a75b..7c21b334a75b 100644 --- a/drivers/net/sfc/txc43128_phy.c +++ b/drivers/net/ethernet/sfc/txc43128_phy.c diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/ethernet/sfc/workarounds.h index 99ff11400cef..99ff11400cef 100644 --- a/drivers/net/sfc/workarounds.h +++ b/drivers/net/ethernet/sfc/workarounds.h |