diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-16 18:31:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-16 18:31:56 -0500 |
| commit | f85fa279138489543206381883c8f67ef94aa912 (patch) | |
| tree | d54d632556885732e94cf18c7cf8d3bef2c740b5 /drivers/net/ethernet/intel/igb/e1000_82575.c | |
| parent | 358b838291f618278080bbed435b755f9b46748e (diff) | |
| parent | ea99d832cce7e724ba37c488e0571a00cb14d430 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_82575.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_82575.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 7881fb95a25b..b8e20f037d0a 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -29,6 +29,8 @@ * e1000_82576 */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/types.h> #include <linux/if_ether.h> @@ -244,8 +246,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) * Check for invalid size */ if ((hw->mac.type == e1000_82576) && (size > 15)) { - printk("igb: The NVM size is not valid, " - "defaulting to 32K.\n"); + pr_notice("The NVM size is not valid, defaulting to 32K\n"); size = 15; } nvm->word_size = 1 << size; |