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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-lpc32xx
/
clock.c
diff --git
a/arch/arm/mach-lpc32xx/clock.c
b/arch/arm/mach-lpc32xx/clock.c
index
32d6379
..
da0e649
100644
(file)
--- a/
arch/arm/mach-lpc32xx/clock.c
+++ b/
arch/arm/mach-lpc32xx/clock.c
@@
-90,10
+90,9
@@
#include <linux/clk.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/clk.h>
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
+#include <linux/clkdev.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
-#include <asm/clkdev.h>
-#include <mach/clkdev.h>
#include <mach/platform.h>
#include "clock.h"
#include "common.h"
#include <mach/platform.h>
#include "clock.h"
#include "common.h"