diff options
Diffstat (limited to 'arch/arm/kernel/time.c')
| -rw-r--r-- | arch/arm/kernel/time.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index ea36bfaeba91..0b51a7c88157 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/timex.h> | 21 | #include <linux/timex.h> |
| 22 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 23 | #include <linux/profile.h> | 23 | #include <linux/profile.h> |
| 24 | #include <linux/syscore_ops.h> | ||
| 25 | #include <linux/timer.h> | 24 | #include <linux/timer.h> |
| 26 | #include <linux/irq.h> | 25 | #include <linux/irq.h> |
| 27 | 26 | ||
| @@ -119,39 +118,6 @@ int __init register_persistent_clock(clock_access_fn read_boot, | |||
| 119 | return -EINVAL; | 118 | return -EINVAL; |
| 120 | } | 119 | } |
| 121 | 120 | ||
| 122 | #if defined(CONFIG_PM) && !defined(CONFIG_GENERIC_CLOCKEVENTS) | ||
| 123 | static int timer_suspend(void) | ||
| 124 | { | ||
| 125 | if (system_timer->suspend) | ||
| 126 | system_timer->suspend(); | ||
| 127 | |||
| 128 | return 0; | ||
| 129 | } | ||
| 130 | |||
| 131 | static void timer_resume(void) | ||
| 132 | { | ||
| 133 | if (system_timer->resume) | ||
| 134 | system_timer->resume(); | ||
| 135 | } | ||
| 136 | #else | ||
| 137 | #define timer_suspend NULL | ||
| 138 | #define timer_resume NULL | ||
| 139 | #endif | ||
| 140 | |||
| 141 | static struct syscore_ops timer_syscore_ops = { | ||
| 142 | .suspend = timer_suspend, | ||
| 143 | .resume = timer_resume, | ||
| 144 | }; | ||
| 145 | |||
| 146 | static int __init timer_init_syscore_ops(void) | ||
| 147 | { | ||
| 148 | register_syscore_ops(&timer_syscore_ops); | ||
| 149 | |||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | |||
| 153 | device_initcall(timer_init_syscore_ops); | ||
| 154 | |||
| 155 | void __init time_init(void) | 121 | void __init time_init(void) |
| 156 | { | 122 | { |
| 157 | system_timer = machine_desc->timer; | 123 | system_timer = machine_desc->timer; |
