Skip to content

L
linux-davinci
Commit 453d1b11 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files
Options

Merge commit 'thumb-2/thumb-2' 

Conflicts:
	arch/arm/include/asm/unified.h
parents fe8b348c 50626552
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
arch/arm/include/asm/unified.h
View file @ 453d1b11
......@@ -35,7 +35,9 @@
#define ARM(x...)
#define THUMB(x...) x
#ifdef __ASSEMBLY__
#define W(instr) instr.w
#endif
#define BSYM(sym) sym + 1
#else /* !CONFIG_THUMB2_KERNEL */
......@@ -45,7 +47,9 @@
#define ARM(x...) x
#define THUMB(x...)
#ifdef __ASSEMBLY__
#define W(instr) instr
#endif
#define BSYM(sym) sym
#endif /* CONFIG_THUMB2_KERNEL */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment