diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
| commit | 71ec63c5d66b577a71910b82740751be73e81310 (patch) | |
| tree | 8a3b7b4fd4068fae1b2fd7ab15e29645daa524f8 /arch/arm/mach-pnx4008/time.c | |
| parent | 627add2d1385394d020c84533c91ad26bc37b166 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master'
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 */ |