diff options
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/mach/arch.h | 3 | ||||
-rw-r--r-- | arch/arm/include/asm/mach/time.h | 30 |
2 files changed, 1 insertions, 32 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 917d4fcfd9b4..308ad7d6f98b 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | struct tag; | 13 | struct tag; |
14 | struct meminfo; | 14 | struct meminfo; |
15 | struct sys_timer; | ||
16 | struct pt_regs; | 15 | struct pt_regs; |
17 | struct smp_operations; | 16 | struct smp_operations; |
18 | #ifdef CONFIG_SMP | 17 | #ifdef CONFIG_SMP |
@@ -48,7 +47,7 @@ struct machine_desc { | |||
48 | void (*map_io)(void);/* IO mapping function */ | 47 | void (*map_io)(void);/* IO mapping function */ |
49 | void (*init_early)(void); | 48 | void (*init_early)(void); |
50 | void (*init_irq)(void); | 49 | void (*init_irq)(void); |
51 | struct sys_timer *timer; /* system tick timer */ | 50 | void (*init_time)(void); |
52 | void (*init_machine)(void); | 51 | void (*init_machine)(void); |
53 | void (*init_late)(void); | 52 | void (*init_late)(void); |
54 | #ifdef CONFIG_MULTI_IRQ_HANDLER | 53 | #ifdef CONFIG_MULTI_IRQ_HANDLER |
diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h index 6ca945f534ab..90c12e1e695c 100644 --- a/arch/arm/include/asm/mach/time.h +++ b/arch/arm/include/asm/mach/time.h | |||
@@ -10,36 +10,6 @@ | |||
10 | #ifndef __ASM_ARM_MACH_TIME_H | 10 | #ifndef __ASM_ARM_MACH_TIME_H |
11 | #define __ASM_ARM_MACH_TIME_H | 11 | #define __ASM_ARM_MACH_TIME_H |
12 | 12 | ||
13 | /* | ||
14 | * This is our kernel timer structure. | ||
15 | * | ||
16 | * - init | ||
17 | * Initialise the kernels jiffy timer source, claim interrupt | ||
18 | * using setup_irq. This is called early on during initialisation | ||
19 | * while interrupts are still disabled on the local CPU. | ||
20 | * - suspend | ||
21 | * Suspend the kernel jiffy timer source, if necessary. This | ||
22 | * is called with interrupts disabled, after all normal devices | ||
23 | * have been suspended. If no action is required, set this to | ||
24 | * NULL. | ||
25 | * - resume | ||
26 | * Resume the kernel jiffy timer source, if necessary. This | ||
27 | * is called with interrupts disabled before any normal devices | ||
28 | * are resumed. If no action is required, set this to NULL. | ||
29 | * - offset | ||
30 | * Return the timer offset in microseconds since the last timer | ||
31 | * interrupt. Note: this must take account of any unprocessed | ||
32 | * timer interrupt which may be pending. | ||
33 | */ | ||
34 | struct sys_timer { | ||
35 | void (*init)(void); | ||
36 | void (*suspend)(void); | ||
37 | void (*resume)(void); | ||
38 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | ||
39 | unsigned long (*offset)(void); | ||
40 | #endif | ||
41 | }; | ||
42 | |||
43 | extern void timer_tick(void); | 13 | extern void timer_tick(void); |
44 | 14 | ||
45 | struct timespec; | 15 | struct timespec; |