Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[safe/jmp/linux-2.6] / drivers / net / sfc / Kconfig

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index 12a8296..a65c986 100644 (file)
--- a/drivers/net/sfc/Kconfig
+++ b/drivers/net/sfc/Kconfig
@@ -1,21 +1,22 @@
 config SFC
-       tristate "Solarflare Solarstorm SFC4000 support"
+       tristate "Solarflare Solarstorm SFC4000/SFC9000-family support"
        depends on PCI && INET
-       select MII
+       select MDIO
        select CRC32
        select I2C
        select I2C_ALGOBIT
        help
          This driver supports 10-gigabit Ethernet cards based on
-         the Solarflare Communications Solarstorm SFC4000 controller.
+         the Solarflare Communications Solarstorm SFC4000 and
+         SFC9000-family controllers.
 
          To compile this driver as a module, choose M here.  The module
          will be called sfc.
 config SFC_MTD
-       bool "Solarflare Solarstorm SFC4000 flash MTD support"
+       bool "Solarflare Solarstorm SFC4000/SFC9000-family MTD support"
        depends on SFC && MTD && !(SFC=y && MTD=m)
        default y
        help
-         This exposes the on-board flash memory as an MTD device (e.g.
-          /dev/mtd1).  This makes it possible to upload new boot code
-          to the NIC.
+         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.