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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
core.c
diff --git
a/arch/arm/mach-integrator/core.c
b/arch/arm/mach-integrator/core.c
index
8f4fb6d
..
b8e884b
100644
(file)
--- a/
arch/arm/mach-integrator/core.c
+++ b/
arch/arm/mach-integrator/core.c
@@
-21,9
+21,8
@@
#include <linux/amba/bus.h>
#include <linux/amba/serial.h>
#include <linux/io.h>
#include <linux/amba/bus.h>
#include <linux/amba/serial.h>
#include <linux/io.h>
+#include <linux/clkdev.h>
-#include <asm/clkdev.h>
-#include <mach/clkdev.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/irq.h>
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/irq.h>