git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-s3c24xx
/
clock.c
diff --git
a/arch/arm/plat-s3c24xx/clock.c
b/arch/arm/plat-s3c24xx/clock.c
index 400541359bfbc617d0b569c8197c6fdfc2e76b90..a005ddbd9ef3b00f16ac1a5668bc19889c4614ea 100644
(file)
--- a/
arch/arm/plat-s3c24xx/clock.c
+++ b/
arch/arm/plat-s3c24xx/clock.c
@@
-47,8
+47,8
@@
#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>
/* clock information */