diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /arch/arm/mach-s3c2442/clock.c | |
| parent | sched_clock: delay using sched_clock() (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c... (diff) | |
| download | linux-cf206bffbb7542df54043fad9898113172af99d8.tar.xz linux-cf206bffbb7542df54043fad9898113172af99d8.zip | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'arch/arm/mach-s3c2442/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2442/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2442/clock.c b/arch/arm/mach-s3c2442/clock.c index 2d030d439fe9..569b5c3d334a 100644 --- a/arch/arm/mach-s3c2442/clock.c +++ b/arch/arm/mach-s3c2442/clock.c @@ -34,12 +34,12 @@ #include <linux/mutex.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/atomic.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/arch/regs-clock.h> +#include <mach/regs-clock.h> #include <asm/plat-s3c24xx/clock.h> #include <asm/plat-s3c24xx/cpu.h> |