diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/mach-lpc32xx | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a (diff) | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff) | |
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 @@ | |||
| 90 | #include <linux/clk.h> | 90 | #include <linux/clk.h> |
| 91 | #include <linux/amba/bus.h> | 91 | #include <linux/amba/bus.h> |
| 92 | #include <linux/amba/clcd.h> | 92 | #include <linux/amba/clcd.h> |
| 93 | #include <linux/clkdev.h> | ||
| 93 | 94 | ||
| 94 | #include <mach/hardware.h> | 95 | #include <mach/hardware.h> |
| 95 | #include <asm/clkdev.h> | ||
| 96 | #include <mach/clkdev.h> | ||
| 97 | #include <mach/platform.h> | 96 | #include <mach/platform.h> |
| 98 | #include "clock.h" | 97 | #include "clock.h" |
| 99 | #include "common.h" | 98 | #include "common.h" |