diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 16:48:22 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 16:48:22 -0800 |
commit | 45b4539309d82ae04e6ed7de494ae194ca0755aa (patch) | |
tree | 2ee6f8118fbce7cf8dafbb3ebd2baf69c065769d /arch/arm/mach-omap2/omap-secure.h | |
parent | 44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (diff) | |
parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
download | op-kernel-dev-45b4539309d82ae04e6ed7de494ae194ca0755aa.zip op-kernel-dev-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.gz |
Merge 3.13-rc2 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-omap2/omap-secure.h')
-rw-r--r-- | arch/arm/mach-omap2/omap-secure.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h index 8cc7d33..3e97c6c 100644 --- a/arch/arm/mach-omap2/omap-secure.h +++ b/arch/arm/mach-omap2/omap-secure.h @@ -76,6 +76,13 @@ static inline void omap_barrier_reserve_memblock(void) { } #endif +#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER void set_cntfreq(void); +#else +static inline void set_cntfreq(void) +{ +} +#endif + #endif /* __ASSEMBLER__ */ #endif /* OMAP_ARCH_OMAP_SECURE_H */ |