diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-08 13:39:36 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-08 13:39:36 -0800 |
| commit | 8527cfce6e15bc6764d13fd28dd2d836345cb89d (patch) | |
| tree | 8b7e816e9f6b91cc788f6d1f120024264094cc5a /arch/arm/mach-shmobile/timer.c | |
| parent | 95650655f7a1a1a93e24dcca45514f17ecf8cee7 (diff) | |
| parent | cdef6b0b6ff40da9a55c8175206c45635428d9fe (diff) | |
Merge tag 'renesas-cleanup-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Renesas ARM Based SoC Cleanup for v4.6
* Remove remnants of removed SCU boot setup code for r8a7779
* Correct s/MIPDR/MPIDR/ typo
* Add includes providing forward declarations
* Make rcar_gen2_dma_contiguous static
* tag 'renesas-cleanup-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code
ARM: shmobile: Typo s/MIPDR/MPIDR/
ARM: shmobile: Add includes providing forward declarations
ARM: shmobile: rcar-gen2: Make rcar_gen2_dma_contiguous static
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/timer.c')
| -rw-r--r-- | arch/arm/mach-shmobile/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index c17d4d3881ff..ad008e4b0c49 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -18,6 +18,8 @@ #include <linux/delay.h> #include <linux/of_address.h> +#include "common.h" + static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz, unsigned int mult, unsigned int div) { |