Merge branch 'timecounter-next'

Browse source

Richard Cochran says:

====================
Fixing the "Time Counter fixes and improvements"

For this series I had only tested the build with ARCH=x86 and arm, but
others like sparc64, microblaze, powerpc, and s390 will fail because
they somehow don't indirectly include clocksource.h for the drivers in
question.

This series fixes the build issues reported by:
 kbuild test robot <fengguang.wu@intel.com>
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-01-02 16:47:51 -05:00

parent b422da7c36 5ce07a5cef

commit dd95539888

7 changed files with 11 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/microblaze/kernel/timer.c

View file

2

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

View file

3

drivers/net/ethernet/intel/e1000e/netdev.c

View file

5

drivers/net/ethernet/intel/igb/igb_ptp.c

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

View file

1

drivers/net/ethernet/mellanox/mlx4/en_clock.c

View file

5

include/linux/timecounter.h

View file