git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
impd1.c
diff --git
a/arch/arm/mach-integrator/impd1.c
b/arch/arm/mach-integrator/impd1.c
index
fd684bf
..
5db574f
100644
(file)
--- a/
arch/arm/mach-integrator/impd1.c
+++ b/
arch/arm/mach-integrator/impd1.c
@@
-22,9
+22,8
@@
#include <linux/amba/clcd.h>
#include <linux/io.h>
#include <linux/slab.h>
+#include <linux/clkdev.h>
-#include <asm/clkdev.h>
-#include <mach/clkdev.h>
#include <asm/hardware/icst.h>
#include <mach/lm.h>
#include <mach/impd1.h>