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

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>

+5 -6
+1 -1
MAINTAINERS
··· 5754 5754 M: Ben Hutchings <bhutchings@solarflare.com> 5755 5755 L: netdev@vger.kernel.org 5756 5756 S: Supported 5757 - F: drivers/net/sfc/ 5757 + F: drivers/net/ethernet/sfc/ 5758 5758 5759 5759 SGI GRU DRIVER 5760 5760 M: Jack Steiner <steiner@sgi.com>
-2
drivers/net/Kconfig
··· 1598 1598 1599 1599 <http://support.brocade.com> 1600 1600 1601 - source "drivers/net/sfc/Kconfig" 1602 - 1603 1601 source "drivers/net/benet/Kconfig" 1604 1602 1605 1603 endif # NETDEV_10000
-1
drivers/net/Makefile
··· 201 201 obj-$(CONFIG_FS_ENET) += fs_enet/ 202 202 203 203 obj-$(CONFIG_VIRTIO_NET) += virtio_net.o 204 - obj-$(CONFIG_SFC) += sfc/ 205 204 206 205 obj-$(CONFIG_WIMAX) += wimax/ 207 206 obj-$(CONFIG_CAIF) += caif/
+1
drivers/net/ethernet/Kconfig
··· 20 20 source "drivers/net/ethernet/i825xx/Kconfig" 21 21 source "drivers/net/ethernet/qlogic/Kconfig" 22 22 source "drivers/net/ethernet/racal/Kconfig" 23 + source "drivers/net/ethernet/sfc/Kconfig" 23 24 source "drivers/net/ethernet/smsc/Kconfig" 24 25 source "drivers/net/ethernet/sun/Kconfig" 25 26
+1
drivers/net/ethernet/Makefile
··· 11 11 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ 12 12 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ 13 13 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ 14 + obj-$(CONFIG_SFC) += sfc/ 14 15 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ 15 16 obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+2 -2
drivers/net/sfc/Kconfig drivers/net/ethernet/sfc/Kconfig
··· 5 5 select CRC32 6 6 select I2C 7 7 select I2C_ALGOBIT 8 - help 8 + ---help--- 9 9 This driver supports 10-gigabit Ethernet cards based on 10 10 the Solarflare SFC4000 and SFC9000-family controllers. 11 11 ··· 15 15 bool "Solarflare SFC4000/SFC9000-family MTD support" 16 16 depends on SFC && MTD && !(SFC=y && MTD=m) 17 17 default y 18 - help 18 + ---help--- 19 19 This exposes the on-board flash memory as MTD devices (e.g. 20 20 /dev/mtd1). This makes it possible to upload new firmware 21 21 to the NIC.
drivers/net/sfc/Makefile drivers/net/ethernet/sfc/Makefile
drivers/net/sfc/bitfield.h drivers/net/ethernet/sfc/bitfield.h
drivers/net/sfc/efx.c drivers/net/ethernet/sfc/efx.c
drivers/net/sfc/efx.h drivers/net/ethernet/sfc/efx.h
drivers/net/sfc/enum.h drivers/net/ethernet/sfc/enum.h
drivers/net/sfc/ethtool.c drivers/net/ethernet/sfc/ethtool.c
drivers/net/sfc/falcon.c drivers/net/ethernet/sfc/falcon.c
drivers/net/sfc/falcon_boards.c drivers/net/ethernet/sfc/falcon_boards.c
drivers/net/sfc/falcon_xmac.c drivers/net/ethernet/sfc/falcon_xmac.c
drivers/net/sfc/filter.c drivers/net/ethernet/sfc/filter.c
drivers/net/sfc/filter.h drivers/net/ethernet/sfc/filter.h
drivers/net/sfc/io.h drivers/net/ethernet/sfc/io.h
drivers/net/sfc/mac.h drivers/net/ethernet/sfc/mac.h
drivers/net/sfc/mcdi.c drivers/net/ethernet/sfc/mcdi.c
drivers/net/sfc/mcdi.h drivers/net/ethernet/sfc/mcdi.h
drivers/net/sfc/mcdi_mac.c drivers/net/ethernet/sfc/mcdi_mac.c
drivers/net/sfc/mcdi_pcol.h drivers/net/ethernet/sfc/mcdi_pcol.h
drivers/net/sfc/mcdi_phy.c drivers/net/ethernet/sfc/mcdi_phy.c
drivers/net/sfc/mdio_10g.c drivers/net/ethernet/sfc/mdio_10g.c
drivers/net/sfc/mdio_10g.h drivers/net/ethernet/sfc/mdio_10g.h
drivers/net/sfc/mtd.c drivers/net/ethernet/sfc/mtd.c
drivers/net/sfc/net_driver.h drivers/net/ethernet/sfc/net_driver.h
drivers/net/sfc/nic.c drivers/net/ethernet/sfc/nic.c
drivers/net/sfc/nic.h drivers/net/ethernet/sfc/nic.h
drivers/net/sfc/phy.h drivers/net/ethernet/sfc/phy.h
drivers/net/sfc/qt202x_phy.c drivers/net/ethernet/sfc/qt202x_phy.c
drivers/net/sfc/regs.h drivers/net/ethernet/sfc/regs.h
drivers/net/sfc/rx.c drivers/net/ethernet/sfc/rx.c
drivers/net/sfc/selftest.c drivers/net/ethernet/sfc/selftest.c
drivers/net/sfc/selftest.h drivers/net/ethernet/sfc/selftest.h
drivers/net/sfc/siena.c drivers/net/ethernet/sfc/siena.c
drivers/net/sfc/spi.h drivers/net/ethernet/sfc/spi.h
drivers/net/sfc/tenxpress.c drivers/net/ethernet/sfc/tenxpress.c
drivers/net/sfc/tx.c drivers/net/ethernet/sfc/tx.c
drivers/net/sfc/txc43128_phy.c drivers/net/ethernet/sfc/txc43128_phy.c
drivers/net/sfc/workarounds.h drivers/net/ethernet/sfc/workarounds.h