diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:43:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:43:20 +0100 |
| commit | 65370bdf881e20907e7a53abab9b8c0bc5f60a6b (patch) | |
| tree | 0d32a494e873b7b92dbfab0e67ffeef597ee8108 /arch/mips/ar7/time.c | |
| parent | locking/mcs: Allow architectures to hook in to contended paths (diff) | |
| parent | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k... (diff) | |
| download | linux-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.tar.xz linux-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.zip | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/ar7/time.c')
| -rw-r--r-- | arch/mips/ar7/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/ar7/time.c b/arch/mips/ar7/time.c index 22c93213b233..1dc6c3b37f91 100644 --- a/arch/mips/ar7/time.c +++ b/arch/mips/ar7/time.c @@ -18,7 +18,6 @@ * Setting up the clock on the MIPS boards. */ -#include <linux/init.h> #include <linux/time.h> #include <linux/err.h> #include <linux/clk.h> |