diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-05 16:03:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-05 16:03:18 -0400 |
| commit | 887e5d5fcc96e3a7c91e19d9bb419c10196ffdc1 (patch) | |
| tree | 259fac45eddabae544b972c21fae7c031202b910 /arch/arm/mach-pnx4008/time.c | |
| parent | e8f75588dd5885868147b329ced4a5093dc6402e (diff) | |
| parent | ba854e18413d2d827f050984edeb8286c3335895 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3711/1: AT91 timer update
[ARM] 3709/1: pnx4008: convert to generic irq subsystem
[ARM] 3710/1: AT91 Serial: Use GPIO API
Diffstat (limited to 'arch/arm/mach-pnx4008/time.c')
| -rw-r--r-- | arch/arm/mach-pnx4008/time.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c index 888bf6cfba8a..756228ddd035 100644 --- a/arch/arm/mach-pnx4008/time.c +++ b/arch/arm/mach-pnx4008/time.c | |||
| @@ -20,17 +20,15 @@ | |||
| 20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/kallsyms.h> | 22 | #include <linux/kallsyms.h> |
| 23 | #include <linux/time.h> | ||
| 24 | #include <linux/timex.h> | ||
| 25 | #include <linux/irq.h> | ||
| 23 | 26 | ||
| 24 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 25 | #include <asm/hardware.h> | 28 | #include <asm/hardware.h> |
| 26 | #include <asm/io.h> | 29 | #include <asm/io.h> |
| 27 | #include <asm/leds.h> | 30 | #include <asm/leds.h> |
| 28 | #include <asm/irq.h> | ||
| 29 | #include <asm/mach/irq.h> | ||
| 30 | #include <asm/mach/time.h> | 31 | #include <asm/mach/time.h> |
| 31 | |||
| 32 | #include <linux/time.h> | ||
| 33 | #include <linux/timex.h> | ||
| 34 | #include <asm/errno.h> | 32 | #include <asm/errno.h> |
| 35 | 33 | ||
| 36 | /*! Note: all timers are UPCOUNTING */ | 34 | /*! Note: all timers are UPCOUNTING */ |