diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-06-23 07:30:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-25 01:13:23 -0400 |
commit | c5d5f5fdc76baf0b8d074338c94bd443635ef9d0 (patch) | |
tree | 29ba76558202a1421d4c8e663f8d570f1856d4aa /drivers/net/sfc | |
parent | 62776d034cc40c49bafdb3551a6ba35f78e3f08d (diff) |
sfc: Replace EFX_DRIVER_NAME with KBUILD_MODNAME
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r-- | drivers/net/sfc/efx.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/net_driver.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 72514005c2a3..ad359110813b 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -2432,7 +2432,7 @@ static struct dev_pm_ops efx_pm_ops = { | |||
2432 | }; | 2432 | }; |
2433 | 2433 | ||
2434 | static struct pci_driver efx_pci_driver = { | 2434 | static struct pci_driver efx_pci_driver = { |
2435 | .name = EFX_DRIVER_NAME, | 2435 | .name = KBUILD_MODNAME, |
2436 | .id_table = efx_pci_table, | 2436 | .id_table = efx_pci_table, |
2437 | .probe = efx_pci_probe, | 2437 | .probe = efx_pci_probe, |
2438 | .remove = efx_pci_remove, | 2438 | .remove = efx_pci_remove, |
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c index 27230a992893..53f3eb20f4ea 100644 --- a/drivers/net/sfc/ethtool.c +++ b/drivers/net/sfc/ethtool.c | |||
@@ -234,7 +234,7 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev, | |||
234 | { | 234 | { |
235 | struct efx_nic *efx = netdev_priv(net_dev); | 235 | struct efx_nic *efx = netdev_priv(net_dev); |
236 | 236 | ||
237 | strlcpy(info->driver, EFX_DRIVER_NAME, sizeof(info->driver)); | 237 | strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); |
238 | strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version)); | 238 | strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version)); |
239 | if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0) | 239 | if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0) |
240 | siena_print_fwver(efx, info->fw_version, | 240 | siena_print_fwver(efx, info->fw_version, |
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 0cca44b4ee44..9116dc977abb 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -39,9 +39,7 @@ | |||
39 | * Build definitions | 39 | * Build definitions |
40 | * | 40 | * |
41 | **************************************************************************/ | 41 | **************************************************************************/ |
42 | #ifndef EFX_DRIVER_NAME | 42 | |
43 | #define EFX_DRIVER_NAME "sfc" | ||
44 | #endif | ||
45 | #define EFX_DRIVER_VERSION "3.0" | 43 | #define EFX_DRIVER_VERSION "3.0" |
46 | 44 | ||
47 | #ifdef EFX_ENABLE_DEBUG | 45 | #ifdef EFX_ENABLE_DEBUG |