Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / net / sfc / Kconfig

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index a65c986..a3d5bb9 100644 (file)
--- a/drivers/net/sfc/Kconfig
+++ b/drivers/net/sfc/Kconfig
@@ -1,5 +1,5 @@
 config SFC
-       tristate "Solarflare Solarstorm SFC4000/SFC9000-family support"
+       tristate "Solarflare SFC4000/SFC9000-family support"
        depends on PCI && INET
        select MDIO
        select CRC32
@@ -7,13 +7,12 @@ config SFC
        select I2C_ALGOBIT
        help
          This driver supports 10-gigabit Ethernet cards based on
-         the Solarflare Communications Solarstorm SFC4000 and
-         SFC9000-family controllers.
+         the Solarflare 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/SFC9000-family MTD support"
+       bool "Solarflare SFC4000/SFC9000-family MTD support"
        depends on SFC && MTD && !(SFC=y && MTD=m)
        default y
        help