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/arm/kernel/entry-v7m.S | |
| parent | e207552e64ea053a33e856828ad7915484911d06 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
| download | op-kernel-dev-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.zip op-kernel-dev-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.tar.gz | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kernel/entry-v7m.S')
| -rw-r--r-- | arch/arm/kernel/entry-v7m.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S index 52b2643..2260f18 100644 --- a/arch/arm/kernel/entry-v7m.S +++ b/arch/arm/kernel/entry-v7m.S @@ -14,8 +14,6 @@ #include <asm/thread_notify.h> #include <asm/v7m.h> -#include <mach/entry-macro.S> - #include "entry-header.S" #ifdef CONFIG_TRACE_IRQFLAGS |
