From 260bc7034e0b2772504c1fff0a9308fd098c91ca Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 13 Jul 2011 16:10:02 +0100 Subject: [PATCH] --- yaml --- r: 256288 b: refs/heads/master c: 851f186835c850cf51001369e4e22c0f9241e745 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/Kconfig | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5ec4f9588745..b652935cbd44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 589327905cf0ce4402f7fb1ed29682f7ae68a82e +refs/heads/master: 851f186835c850cf51001369e4e22c0f9241e745 diff --git a/trunk/drivers/net/sfc/Kconfig b/trunk/drivers/net/sfc/Kconfig index a65c98638398..db7b22eb686a 100644 --- a/trunk/drivers/net/sfc/Kconfig +++ b/trunk/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,13 @@ 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 Communications 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