diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
| commit | 4366004d77278a90c18f92f7cb9ec0c264da563d (patch) | |
| tree | 4fb046b6b06cc681f791a8ddf7507b5f8eb99be8 /drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |
| parent | e9f0fb88493570200b8dc1cc02d3e676412d25bc (diff) | |
| parent | a450a685791d12c0a477b75d630d6ae66acab9a7 (diff) | |
| download | lwn-4366004d77278a90c18f92f7cb9ec0c264da563d.tar.gz lwn-4366004d77278a90c18f92f7cb9ec0c264da563d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c
Both conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_common.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 6cc148b7c132..bdc55819179d 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c @@ -1199,7 +1199,7 @@ static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw, */ hw->eeprom.word_page_size = IXGBE_EEPROM_PAGE_SIZE_MAX - data[0]; - hw_dbg(hw, "Detected EEPROM page size = %d words.", + hw_dbg(hw, "Detected EEPROM page size = %d words.\n", hw->eeprom.word_page_size); out: return status; |