diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 18:26:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 18:26:47 -0400 |
| commit | 9f48c89862e39b7f33b44123fc425cf901c89428 (patch) | |
| tree | 373886606ada8c2e0c362afbcce490af27d21552 /arch/sparc/mm/tsb.c | |
| parent | 2a211f320ee3d86835b40efd2948642482d3c933 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge 3.16-rc5 into char-misc-next
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/mm/tsb.c')
| -rw-r--r-- | arch/sparc/mm/tsb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c index fe19b81acc09..a06576683c38 100644 --- a/arch/sparc/mm/tsb.c +++ b/arch/sparc/mm/tsb.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <asm/page.h> | 9 | #include <asm/page.h> |
| 10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
| 11 | #include <asm/mmu_context.h> | 11 | #include <asm/mmu_context.h> |
| 12 | #include <asm/setup.h> | ||
| 12 | #include <asm/tsb.h> | 13 | #include <asm/tsb.h> |
| 13 | #include <asm/tlb.h> | 14 | #include <asm/tlb.h> |
| 14 | #include <asm/oplib.h> | 15 | #include <asm/oplib.h> |