]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blobdiff - arch/arm/plat-s3c24xx/s3c244x-clock.c
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into...
[mirror_ubuntu-artful-kernel.git] / arch / arm / plat-s3c24xx / s3c244x-clock.c
index faf3e0f9f4e23b9647850038e6312c38b530a4f6..8a5fffde663194d9b2dc7c387ed2527f92fcb582 100644 (file)
 #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>