Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
[safe/jmp/linux-2.6] / arch / arm / plat-s3c24xx / pwm-clock.c
index d41cccd..3fad68a 100644 (file)
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <asm/plat-s3c24xx/clock.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/clock.h>
+#include <plat/cpu.h>
 
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 
 /* Each of the timers 0 through 5 go through the following
  * clock tree, with the inputs depending on the timers.