diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-29 22:31:51 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-29 22:32:52 +1100 |
| commit | 3b9672fff747b31a2204003cab9fe082321edc1b (patch) | |
| tree | 392ca7c68d28e375342c799162789b43cfcfc503 /arch/powerpc/mm | |
| parent | e901378578c62202594cba0f6c076f3df365ec91 (diff) | |
| parent | b6ae3550c8e2ca8f7ce1b7f04585dc12a0eb5cbd (diff) | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Updates from Scott:
"This contains a couple device tree updates, and a fix for a missing
prototype warning."
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/8xx_mmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/8xx_mmu.c b/arch/powerpc/mm/8xx_mmu.c index ca01ece28ab3..01b7f5107c3a 100644 --- a/arch/powerpc/mm/8xx_mmu.c +++ b/arch/powerpc/mm/8xx_mmu.c @@ -13,6 +13,7 @@ */ #include <linux/memblock.h> +#include <linux/mmu_context.h> #include <asm/fixmap.h> #include <asm/code-patching.h> |