diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
| commit | 70f05366b71c51c35c25c0b76b4318fbc26c975a (patch) | |
| tree | d31230b93ba7df50d87eb11b1dba091641a9b89e /arch/arm/mach-pnx4008/time.c | |
| parent | c0bc8721b8d0380ec69fa97578c91201201b05a9 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master' into upstream
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 888bf6cfba8..756228ddd03 100644 --- a/arch/arm/mach-pnx4008/time.c +++ b/arch/arm/mach-pnx4008/time.c @@ -20,17 +20,15 @@ #include <linux/spinlock.h> #include <linux/module.h> #include <linux/kallsyms.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <linux/irq.h> #include <asm/system.h> #include <asm/hardware.h> #include <asm/io.h> #include <asm/leds.h> -#include <asm/irq.h> -#include <asm/mach/irq.h> #include <asm/mach/time.h> - -#include <linux/time.h> -#include <linux/timex.h> #include <asm/errno.h> /*! Note: all timers are UPCOUNTING */ |