diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 18:50:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 18:50:03 -0500 |
| commit | 4457e6f6c9f6052cd5f44a79037108b5ddeb0ce7 (patch) | |
| tree | 394733989d9f68e8380ace4948976a92336e6b16 /arch/sparc/include | |
| parent | e87e7be92979480ee5a2d4a746dc88f2eeca79ca (diff) | |
| parent | 6a328f3fe042396c6525d7bf84cfd941440cc045 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Two merge window fallout build fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: merge fix
sparc64: fix build regession
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/tlbflush_64.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h index f0d6a9700f4c..3c3c89f52643 100644 --- a/arch/sparc/include/asm/tlbflush_64.h +++ b/arch/sparc/include/asm/tlbflush_64.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef _SPARC64_TLBFLUSH_H | 1 | #ifndef _SPARC64_TLBFLUSH_H |
| 2 | #define _SPARC64_TLBFLUSH_H | 2 | #define _SPARC64_TLBFLUSH_H |
| 3 | 3 | ||
| 4 | #include <linux/mm.h> | ||
| 5 | #include <asm/mmu_context.h> | 4 | #include <asm/mmu_context.h> |
| 6 | 5 | ||
| 7 | /* TSB flush operations. */ | 6 | /* TSB flush operations. */ |