---

yaml --- r: 265211 b: refs/heads/master c: 874aeea h: refs/heads/master i: 265209: b35a205 265207: cc75804 v: v3
git-mirror · Aug 11, 2011 · 038b332 · 038b332
1 parent 1965de9
commit 038b332
Show file tree

Hide file tree

Showing 43 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e689cf4a042772f727450035b102579b0c01bdc7
+refs/heads/master: 874aeea5d01cac55c160a4e503e3ddb4db030de7
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -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>

diff --git a/trunk/drivers/net/Kconfig b/trunk/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/trunk/drivers/net/Makefile b/trunk/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/trunk/drivers/net/ethernet/Kconfig b/trunk/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/trunk/drivers/net/ethernet/Makefile b/trunk/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/trunk/drivers/net/sfc/Kconfig → trunk/drivers/net/ethernet/sfc/Kconfig b/trunk/drivers/net/sfc/Kconfig → trunk/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/trunk/drivers/net/sfc/Makefile → trunk/drivers/net/ethernet/sfc/Makefile b/trunk/drivers/net/sfc/Makefile → trunk/drivers/net/ethernet/sfc/Makefile
diff --git a/trunk/drivers/net/sfc/bitfield.h → trunk/drivers/net/ethernet/sfc/bitfield.h b/trunk/drivers/net/sfc/bitfield.h → trunk/drivers/net/ethernet/sfc/bitfield.h
diff --git a/trunk/drivers/net/sfc/efx.c → trunk/drivers/net/ethernet/sfc/efx.c b/trunk/drivers/net/sfc/efx.c → trunk/drivers/net/ethernet/sfc/efx.c
diff --git a/trunk/drivers/net/sfc/efx.h → trunk/drivers/net/ethernet/sfc/efx.h b/trunk/drivers/net/sfc/efx.h → trunk/drivers/net/ethernet/sfc/efx.h
diff --git a/trunk/drivers/net/sfc/enum.h → trunk/drivers/net/ethernet/sfc/enum.h b/trunk/drivers/net/sfc/enum.h → trunk/drivers/net/ethernet/sfc/enum.h
diff --git a/trunk/drivers/net/sfc/ethtool.c → trunk/drivers/net/ethernet/sfc/ethtool.c b/trunk/drivers/net/sfc/ethtool.c → trunk/drivers/net/ethernet/sfc/ethtool.c
diff --git a/trunk/drivers/net/sfc/falcon.c → trunk/drivers/net/ethernet/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c → trunk/drivers/net/ethernet/sfc/falcon.c
diff --git a/trunk/drivers/net/sfc/falcon_boards.c → .../drivers/net/ethernet/sfc/falcon_boards.c b/trunk/drivers/net/sfc/falcon_boards.c → .../drivers/net/ethernet/sfc/falcon_boards.c
diff --git a/trunk/drivers/net/sfc/falcon_xmac.c → trunk/drivers/net/ethernet/sfc/falcon_xmac.c b/trunk/drivers/net/sfc/falcon_xmac.c → trunk/drivers/net/ethernet/sfc/falcon_xmac.c
diff --git a/trunk/drivers/net/sfc/filter.c → trunk/drivers/net/ethernet/sfc/filter.c b/trunk/drivers/net/sfc/filter.c → trunk/drivers/net/ethernet/sfc/filter.c
diff --git a/trunk/drivers/net/sfc/filter.h → trunk/drivers/net/ethernet/sfc/filter.h b/trunk/drivers/net/sfc/filter.h → trunk/drivers/net/ethernet/sfc/filter.h
diff --git a/trunk/drivers/net/sfc/io.h → trunk/drivers/net/ethernet/sfc/io.h b/trunk/drivers/net/sfc/io.h → trunk/drivers/net/ethernet/sfc/io.h
diff --git a/trunk/drivers/net/sfc/mac.h → trunk/drivers/net/ethernet/sfc/mac.h b/trunk/drivers/net/sfc/mac.h → trunk/drivers/net/ethernet/sfc/mac.h
diff --git a/trunk/drivers/net/sfc/mcdi.c → trunk/drivers/net/ethernet/sfc/mcdi.c b/trunk/drivers/net/sfc/mcdi.c → trunk/drivers/net/ethernet/sfc/mcdi.c
diff --git a/trunk/drivers/net/sfc/mcdi.h → trunk/drivers/net/ethernet/sfc/mcdi.h b/trunk/drivers/net/sfc/mcdi.h → trunk/drivers/net/ethernet/sfc/mcdi.h
diff --git a/trunk/drivers/net/sfc/mcdi_mac.c → trunk/drivers/net/ethernet/sfc/mcdi_mac.c b/trunk/drivers/net/sfc/mcdi_mac.c → trunk/drivers/net/ethernet/sfc/mcdi_mac.c
diff --git a/trunk/drivers/net/sfc/mcdi_pcol.h → trunk/drivers/net/ethernet/sfc/mcdi_pcol.h b/trunk/drivers/net/sfc/mcdi_pcol.h → trunk/drivers/net/ethernet/sfc/mcdi_pcol.h
diff --git a/trunk/drivers/net/sfc/mcdi_phy.c → trunk/drivers/net/ethernet/sfc/mcdi_phy.c b/trunk/drivers/net/sfc/mcdi_phy.c → trunk/drivers/net/ethernet/sfc/mcdi_phy.c
diff --git a/trunk/drivers/net/sfc/mdio_10g.c → trunk/drivers/net/ethernet/sfc/mdio_10g.c b/trunk/drivers/net/sfc/mdio_10g.c → trunk/drivers/net/ethernet/sfc/mdio_10g.c
diff --git a/trunk/drivers/net/sfc/mdio_10g.h → trunk/drivers/net/ethernet/sfc/mdio_10g.h b/trunk/drivers/net/sfc/mdio_10g.h → trunk/drivers/net/ethernet/sfc/mdio_10g.h
diff --git a/trunk/drivers/net/sfc/mtd.c → trunk/drivers/net/ethernet/sfc/mtd.c b/trunk/drivers/net/sfc/mtd.c → trunk/drivers/net/ethernet/sfc/mtd.c
diff --git a/trunk/drivers/net/sfc/net_driver.h → trunk/drivers/net/ethernet/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h → trunk/drivers/net/ethernet/sfc/net_driver.h
diff --git a/trunk/drivers/net/sfc/nic.c → trunk/drivers/net/ethernet/sfc/nic.c b/trunk/drivers/net/sfc/nic.c → trunk/drivers/net/ethernet/sfc/nic.c
diff --git a/trunk/drivers/net/sfc/nic.h → trunk/drivers/net/ethernet/sfc/nic.h b/trunk/drivers/net/sfc/nic.h → trunk/drivers/net/ethernet/sfc/nic.h
diff --git a/trunk/drivers/net/sfc/phy.h → trunk/drivers/net/ethernet/sfc/phy.h b/trunk/drivers/net/sfc/phy.h → trunk/drivers/net/ethernet/sfc/phy.h
diff --git a/trunk/drivers/net/sfc/qt202x_phy.c → trunk/drivers/net/ethernet/sfc/qt202x_phy.c b/trunk/drivers/net/sfc/qt202x_phy.c → trunk/drivers/net/ethernet/sfc/qt202x_phy.c
diff --git a/trunk/drivers/net/sfc/regs.h → trunk/drivers/net/ethernet/sfc/regs.h b/trunk/drivers/net/sfc/regs.h → trunk/drivers/net/ethernet/sfc/regs.h
diff --git a/trunk/drivers/net/sfc/rx.c → trunk/drivers/net/ethernet/sfc/rx.c b/trunk/drivers/net/sfc/rx.c → trunk/drivers/net/ethernet/sfc/rx.c
diff --git a/trunk/drivers/net/sfc/selftest.c → trunk/drivers/net/ethernet/sfc/selftest.c b/trunk/drivers/net/sfc/selftest.c → trunk/drivers/net/ethernet/sfc/selftest.c
diff --git a/trunk/drivers/net/sfc/selftest.h → trunk/drivers/net/ethernet/sfc/selftest.h b/trunk/drivers/net/sfc/selftest.h → trunk/drivers/net/ethernet/sfc/selftest.h
diff --git a/trunk/drivers/net/sfc/siena.c → trunk/drivers/net/ethernet/sfc/siena.c b/trunk/drivers/net/sfc/siena.c → trunk/drivers/net/ethernet/sfc/siena.c
diff --git a/trunk/drivers/net/sfc/spi.h → trunk/drivers/net/ethernet/sfc/spi.h b/trunk/drivers/net/sfc/spi.h → trunk/drivers/net/ethernet/sfc/spi.h
diff --git a/trunk/drivers/net/sfc/tenxpress.c → trunk/drivers/net/ethernet/sfc/tenxpress.c b/trunk/drivers/net/sfc/tenxpress.c → trunk/drivers/net/ethernet/sfc/tenxpress.c
diff --git a/trunk/drivers/net/sfc/tx.c → trunk/drivers/net/ethernet/sfc/tx.c b/trunk/drivers/net/sfc/tx.c → trunk/drivers/net/ethernet/sfc/tx.c
diff --git a/trunk/drivers/net/sfc/txc43128_phy.c → ...k/drivers/net/ethernet/sfc/txc43128_phy.c b/trunk/drivers/net/sfc/txc43128_phy.c → ...k/drivers/net/ethernet/sfc/txc43128_phy.c
diff --git a/trunk/drivers/net/sfc/workarounds.h → trunk/drivers/net/ethernet/sfc/workarounds.h b/trunk/drivers/net/sfc/workarounds.h → trunk/drivers/net/ethernet/sfc/workarounds.h