diff options
| author | Russell King | 2011-01-06 23:32:52 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-06 23:32:52 +0100 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/mach-lpc32xx | |
| parent | Merge branch 'clksrc' into devel (diff) | |
| parent | Merge branch 'smp' into misc (diff) | |
| download | kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.gz kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.xz kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/mach-lpc32xx')
| -rw-r--r-- | arch/arm/mach-lpc32xx/clock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c index 32d63796430a..da0e6498110a 100644 --- 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/clkdev.h> #include <mach/hardware.h> -#include <asm/clkdev.h> -#include <mach/clkdev.h> #include <mach/platform.h> #include "clock.h" #include "common.h" |