projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'smp' into misc
[cascardo/linux.git]
/
arch
/
arm
/
mach-vexpress
/
ct-ca9x4.c
diff --git
a/arch/arm/mach-vexpress/ct-ca9x4.c
b/arch/arm/mach-vexpress/ct-ca9x4.c
index
fd25ccd
..
f4455e3
100644
(file)
--- a/
arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/
arch/arm/mach-vexpress/ct-ca9x4.c
@@
-8,8
+8,8
@@
#include <linux/platform_device.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/platform_device.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
+#include <linux/clkdev.h>
-#include <asm/clkdev.h>
#include <asm/pgtable.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/pgtable.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/cache-l2x0.h>
@@
-18,7
+18,6
@@
#include <asm/pmu.h>
#include <asm/smp_twd.h>
#include <asm/pmu.h>
#include <asm/smp_twd.h>
-#include <mach/clkdev.h>
#include <mach/ct-ca9x4.h>
#include <plat/timer-sp.h>
#include <mach/ct-ca9x4.h>
#include <plat/timer-sp.h>