From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 13 Jul 2011 15:21:24 +0000 (+0100)
Subject: sfc: Remove 'Communications' after 'Solarflare' in references to hardware
X-Git-Tag: v3.1-rc1~316^2~154^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ff79c8ac40a115adf5d94e1349f4a379ae156f55

sfc: Remove 'Communications' after 'Solarflare' in references to hardware

Branding can now be abbreviated.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index db7b22eb686a..a3d5bb9e39dc 100644
--- a/drivers/net/sfc/Kconfig
+++ b/drivers/net/sfc/Kconfig
@@ -7,8 +7,7 @@ config SFC
 	select I2C_ALGOBIT
 	help
 	  This driver supports 10-gigabit Ethernet cards based on
-	  the Solarflare Communications 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.
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index ff162df06bd0..faca764aa21b 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -2476,7 +2476,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
 		goto fail1;
 
 	netif_info(efx, probe, efx->net_dev,
-		   "Solarflare Communications NIC detected\n");
+		   "Solarflare NIC detected\n");
 
 	/* Set up basic I/O (BAR mappings etc) */
 	rc = efx_init_io(efx);