diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-04 12:04:11 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-04 12:04:11 +0100 |
commit | 5693188a6e888603afa9564974145e5e6e2c623c (patch) | |
tree | d092580bb003f34fb630d62916214a045ba078f1 /arch/arm/include/asm | |
parent | Merge branch 'intr-ctxsw' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable (diff) | |
parent | ARM: architected timers: remove support for non DT platforms (diff) | |
download | linux-dev-5693188a6e888603afa9564974145e5e6e2c623c.tar.xz linux-dev-5693188a6e888603afa9564974145e5e6e2c623c.zip |
Merge branch 'timers-v3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r-- | arch/arm/include/asm/arch_timer.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h new file mode 100644 index 000000000000..ed2e95d46e29 --- /dev/null +++ b/arch/arm/include/asm/arch_timer.h @@ -0,0 +1,19 @@ +#ifndef __ASMARM_ARCH_TIMER_H +#define __ASMARM_ARCH_TIMER_H + +#ifdef CONFIG_ARM_ARCH_TIMER +int arch_timer_of_register(void); +int arch_timer_sched_clock_init(void); +#else +static inline int arch_timer_of_register(void) +{ + return -ENXIO; +} + +static inline int arch_timer_sched_clock_init(void) +{ + return -ENXIO; +} +#endif + +#endif |