From d12471572069def616b32bfb183e88bccc72d83b Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 23 Jun 2010 11:30:26 +0000
Subject: [PATCH] --- yaml --- r: 203153 b: refs/heads/master c:
 c5d5f5fdc76baf0b8d074338c94bd443635ef9d0 h: refs/heads/master i:   203151:
 54fd2c2d570aeca54400ecf1d106f17e94964760 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/sfc/efx.c        | 2 +-
 trunk/drivers/net/sfc/ethtool.c    | 2 +-
 trunk/drivers/net/sfc/net_driver.h | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9bdb2b79737e..aaccaa96a0cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62776d034cc40c49bafdb3551a6ba35f78e3f08d
+refs/heads/master: c5d5f5fdc76baf0b8d074338c94bd443635ef9d0
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index 72514005c2a3..ad359110813b 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/drivers/net/sfc/efx.c
@@ -2432,7 +2432,7 @@ static struct dev_pm_ops efx_pm_ops = {
 };
 
 static struct pci_driver efx_pci_driver = {
-	.name		= EFX_DRIVER_NAME,
+	.name		= KBUILD_MODNAME,
 	.id_table	= efx_pci_table,
 	.probe		= efx_pci_probe,
 	.remove		= efx_pci_remove,
diff --git a/trunk/drivers/net/sfc/ethtool.c b/trunk/drivers/net/sfc/ethtool.c
index 27230a992893..53f3eb20f4ea 100644
--- a/trunk/drivers/net/sfc/ethtool.c
+++ b/trunk/drivers/net/sfc/ethtool.c
@@ -234,7 +234,7 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
 {
 	struct efx_nic *efx = netdev_priv(net_dev);
 
-	strlcpy(info->driver, EFX_DRIVER_NAME, sizeof(info->driver));
+	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
 	strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version));
 	if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0)
 		siena_print_fwver(efx, info->fw_version,
diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h
index 0cca44b4ee44..9116dc977abb 100644
--- a/trunk/drivers/net/sfc/net_driver.h
+++ b/trunk/drivers/net/sfc/net_driver.h
@@ -39,9 +39,7 @@
  * Build definitions
  *
  **************************************************************************/
-#ifndef EFX_DRIVER_NAME
-#define EFX_DRIVER_NAME	"sfc"
-#endif
+
 #define EFX_DRIVER_VERSION	"3.0"
 
 #ifdef EFX_ENABLE_DEBUG