---

yaml --- r: 256289 b: refs/heads/master c: ff79c8a h: refs/heads/master i: 256287: 0858330 v: v3
git-mirror · Jul 13, 2011 · ea10b2c · ea10b2c
1 parent 260bc70
commit ea10b2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);