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 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
mach-versatile
/
core.c
diff --git
a/arch/arm/mach-versatile/core.c
b/arch/arm/mach-versatile/core.c
index 824121d52b8d1d20fe2365c615345022c757fc2b..565e0ba0d67e082b9481f6008d065302a5b0042f 100644
(file)
--- a/
arch/arm/mach-versatile/core.c
+++ b/
arch/arm/mach-versatile/core.c
@@
-28,9
+28,9
@@
#include <linux/amba/clcd.h>
#include <linux/clocksource.h>
#include <linux/clockchips.h>
+#include <linux/cnt32_to_63.h>
#include <linux/io.h>
-#include <asm/cnt32_to_63.h>
#include <asm/system.h>
#include <mach/hardware.h>
#include <asm/irq.h>