diff options
| author | Paul Mundt | 2009-05-12 12:54:36 +0200 |
|---|---|---|
| committer | Paul Mundt | 2009-05-12 12:54:36 +0200 |
| commit | fd5b12458b25a88eb6f6b56464846d98a45e8928 (patch) | |
| tree | 916107480879f131b504652af4f74524b2f327b3 /arch/sh/kernel/cpu/clock.c | |
| parent | sh: clkfwk: Use arch_clk_init() for on-chip clock registration. (diff) | |
| parent | sh: Kill off the remnants of the old timer code. (diff) | |
| download | kernel-qcow2-linux-fd5b12458b25a88eb6f6b56464846d98a45e8928.tar.gz kernel-qcow2-linux-fd5b12458b25a88eb6f6b56464846d98a45e8928.tar.xz kernel-qcow2-linux-fd5b12458b25a88eb6f6b56464846d98a45e8928.zip | |
Merge branch 'master' into sh/clkfwk
Diffstat (limited to 'arch/sh/kernel/cpu/clock.c')
| -rw-r--r-- | arch/sh/kernel/cpu/clock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index f833843a194a..61ff227561dc 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c @@ -30,7 +30,6 @@ #include <linux/platform_device.h> #include <linux/proc_fs.h> #include <asm/clock.h> -#include <asm/timer.h> static LIST_HEAD(clock_list); static DEFINE_SPINLOCK(clock_lock); |