projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
mach-s3c2412
/
clock.c
diff --git
a/arch/arm/mach-s3c2412/clock.c
b/arch/arm/mach-s3c2412/clock.c
index 8be4cd677385124f6761ec4c661caf830c1f0865..96d9eb15424f38087ec3b2a210add4ab7ea4d842 100644
(file)
--- a/
arch/arm/mach-s3c2412/clock.c
+++ b/
arch/arm/mach-s3c2412/clock.c
@@
-31,11
+31,11
@@
#include <linux/mutex.h>
#include <linux/delay.h>
#include <linux/serial_core.h>
+#include <linux/io.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <plat/regs-serial.h>
#include <mach/regs-clock.h>