diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 13:39:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 13:39:02 -0400 |
| commit | 7e31aa11fc672bbe0dd0da59513c9efe3809ced7 (patch) | |
| tree | 0aafe6a0045230950ce6b26579a053da12614a49 /include/asm-arm/mach/time.h | |
| parent | 071f4924844c435a3ae0cdbab7d7df2f1da85713 (diff) | |
| parent | 9cb7117fa4858468014f76bd996076985111e955 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5182/1: pxa: Fix pcm990 compilation
[ARM] Fix explicit asm(-arm)?/arch-foo references
[ARM] move include/asm-arm to arch/arm/include/asm
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
[ARM] initrd: claim initrd memory exclusively
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
[ARM] i.MX: add missing clock functions exports
[ARM] i.MX: remove set_imx_fb_info() export
[ARM] mx1ads: make mmc platform data available for modules
[ARM] mx2: add missing Kconfig dependency
Diffstat (limited to 'include/asm-arm/mach/time.h')
| -rw-r--r-- | include/asm-arm/mach/time.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h deleted file mode 100644 index 2fd36ea0130d..000000000000 --- a/include/asm-arm/mach/time.h +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/asm-arm/mach/time.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 MontaVista Software, Inc. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | #ifndef __ASM_ARM_MACH_TIME_H | ||
| 11 | #define __ASM_ARM_MACH_TIME_H | ||
| 12 | |||
| 13 | #include <linux/sysdev.h> | ||
| 14 | |||
| 15 | /* | ||
| 16 | * This is our kernel timer structure. | ||
| 17 | * | ||
| 18 | * - init | ||
| 19 | * Initialise the kernels jiffy timer source, claim interrupt | ||
| 20 | * using setup_irq. This is called early on during initialisation | ||
| 21 | * while interrupts are still disabled on the local CPU. | ||
| 22 | * - suspend | ||
| 23 | * Suspend the kernel jiffy timer source, if necessary. This | ||
| 24 | * is called with interrupts disabled, after all normal devices | ||
| 25 | * have been suspended. If no action is required, set this to | ||
| 26 | * NULL. | ||
| 27 | * - resume | ||
| 28 | * Resume the kernel jiffy timer source, if necessary. This | ||
| 29 | * is called with interrupts disabled before any normal devices | ||
| 30 | * are resumed. If no action is required, set this to NULL. | ||
| 31 | * - offset | ||
| 32 | * Return the timer offset in microseconds since the last timer | ||
| 33 | * interrupt. Note: this must take account of any unprocessed | ||
| 34 | * timer interrupt which may be pending. | ||
| 35 | */ | ||
| 36 | struct sys_timer { | ||
| 37 | struct sys_device dev; | ||
| 38 | void (*init)(void); | ||
| 39 | void (*suspend)(void); | ||
| 40 | void (*resume)(void); | ||
| 41 | #ifndef CONFIG_GENERIC_TIME | ||
| 42 | unsigned long (*offset)(void); | ||
| 43 | #endif | ||
| 44 | }; | ||
| 45 | |||
| 46 | extern struct sys_timer *system_timer; | ||
| 47 | extern void timer_tick(void); | ||
| 48 | |||
| 49 | /* | ||
| 50 | * Kernel time keeping support. | ||
| 51 | */ | ||
| 52 | struct timespec; | ||
| 53 | extern int (*set_rtc)(void); | ||
| 54 | extern void save_time_delta(struct timespec *delta, struct timespec *rtc); | ||
| 55 | extern void restore_time_delta(struct timespec *delta, struct timespec *rtc); | ||
| 56 | |||
| 57 | #endif | ||