diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 21:10:12 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 21:10:12 +0100 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-ks8695/time.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-ks8695/time.c')
| -rw-r--r-- | arch/arm/mach-ks8695/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c index 02f766b3121..940888dffc1 100644 --- a/arch/arm/mach-ks8695/time.c +++ b/arch/arm/mach-ks8695/time.c @@ -28,8 +28,8 @@ #include <asm/io.h> #include <asm/mach/time.h> -#include <asm/arch/regs-timer.h> -#include <asm/arch/regs-irq.h> +#include <mach/regs-timer.h> +#include <mach/regs-irq.h> #include "generic.h" |