Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277574
b: refs/heads/master
c: 82bbcde
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Jeff Kirsher committed Nov 16, 2011
1 parent 7018a63 commit 4a41c4f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 876d2d6f6e60b1170f7ed664b9659def92b87be3
refs/heads/master: 82bbcdebbac75bf7636bf63ac0e6e4a49b128978
5 changes: 3 additions & 2 deletions trunk/drivers/net/ethernet/intel/igb/e1000_82575.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
* e1000_82576
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/types.h>
#include <linux/if_ether.h>

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4a41c4f

Please sign in to comment.