From ea10b2ccb70fe288e83bf4d2aac14b6f4a0ec818 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 13 Jul 2011 16:21:24 +0100
Subject: [PATCH] --- yaml --- r: 256289 b: refs/heads/master c:
 ff79c8ac40a115adf5d94e1349f4a379ae156f55 h: refs/heads/master i:   256287:
 08583307f90338a0d5a8f542048462a3a996336f v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/sfc/Kconfig | 3 +--
 trunk/drivers/net/sfc/efx.c   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b652935cbd44..eef91cb95425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 851f186835c850cf51001369e4e22c0f9241e745
+refs/heads/master: ff79c8ac40a115adf5d94e1349f4a379ae156f55
diff --git a/trunk/drivers/net/sfc/Kconfig b/trunk/drivers/net/sfc/Kconfig
index db7b22eb686a..a3d5bb9e39dc 100644
--- a/trunk/drivers/net/sfc/Kconfig
+++ b/trunk/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/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index ff162df06bd0..faca764aa21b 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/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);