netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Hutchings <bhutchings@solarflare.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com
Subject: [PATCH net-next-2.6 7/7] sfc: Remove 'Communications' after 'Solarflare' in references to hardware
Date: Thu, 14 Jul 2011 02:18:05 +0100	[thread overview]
Message-ID: <1310606285.2756.30.camel@bwh-desktop> (raw)
In-Reply-To: <1310606090.2756.23.camel@bwh-desktop>

Branding can now be abbreviated.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/sfc/Kconfig |    3 +--
 drivers/net/sfc/efx.c   |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/Kconfig b/drivers/net/sfc/Kconfig
index db7b22e..a3d5bb9 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 ff162df..faca764 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);
-- 
1.7.4.4


-- 
Ben Hutchings, Senior Software Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.


  parent reply	other threads:[~2011-07-14  1:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-14  1:14 pull request: sfc-next 2011-07-14 Ben Hutchings
2011-07-14  1:16 ` [PATCH net-next-2.6 1/7] sfc: Fix loop condition for efx_filter_search() when !for_insert Ben Hutchings
2011-07-14  1:16 ` [PATCH net-next-2.6 2/7] sfc: Allow resets to be upgraded; use atomic ops for safety Ben Hutchings
2011-07-14  1:16 ` [PATCH net-next-2.6 3/7] sfc: Fix mapping of reset reasons and flags to methods Ben Hutchings
2011-07-14  1:17 ` [PATCH net-next-2.6 4/7] sfc: Fix Siena mac statistics on big endian platforms Ben Hutchings
2011-07-14  1:17 ` [PATCH net-next-2.6 5/7] sfc: Fix assertions in efx_filter_rfs() Ben Hutchings
2011-07-14  1:17 ` [PATCH net-next-2.6 6/7] sfc: Remove 'Solarstorm' from Kconfig descriptions Ben Hutchings
2011-07-14  1:18 ` Ben Hutchings [this message]
2011-07-14 15:44 ` pull request: sfc-next 2011-07-14 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1310606285.2756.30.camel@bwh-desktop \
    --to=bhutchings@solarflare.com \
    --cc=davem@davemloft.net \
    --cc=linux-net-drivers@solarflare.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).