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/sh/kernel/cpu/clock-cpg.c | |
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/sh/kernel/cpu/clock-cpg.c')
-rw-r--r-- | arch/sh/kernel/cpu/clock-cpg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c index e2f63d68da51..dd0e0f211359 100644 --- a/arch/sh/kernel/cpu/clock-cpg.c +++ b/arch/sh/kernel/cpu/clock-cpg.c @@ -2,7 +2,7 @@ #include <linux/compiler.h> #include <linux/slab.h> #include <linux/io.h> -#include <asm/clkdev.h> +#include <linux/clkdev.h> #include <asm/clock.h> static struct clk master_clk = { |