diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /arch/sh/kernel/cpu/clock-cpg.c | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 (diff) | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
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 @@ | |||
| 2 | #include <linux/compiler.h> | 2 | #include <linux/compiler.h> |
| 3 | #include <linux/slab.h> | 3 | #include <linux/slab.h> |
| 4 | #include <linux/io.h> | 4 | #include <linux/io.h> |
| 5 | #include <asm/clkdev.h> | 5 | #include <linux/clkdev.h> |
| 6 | #include <asm/clock.h> | 6 | #include <asm/clock.h> |
| 7 | 7 | ||
| 8 | static struct clk master_clk = { | 8 | static struct clk master_clk = { |