From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Dec 2012 00:39:08 +0000 (-0800)
Subject: Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0264405b84505f60ae00625f261e75a32c7ddf56;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'asm-generic' of git://git./linux/kernel/git/arnd/asm-generic

Pull asm-generic cleanup from Arnd Bergmann:
 "These are a few cleanups for asm-generic:

   - a set of patches from Lars-Peter Clausen to generalize asm/mmu.h
     and use it in the architectures that don't need any special
     handling.
   - A patch from Will Deacon to remove the {read,write}s{b,w,l} as
     discussed during the arm64 review
   - A patch from James Hogan that helps with the meta architecture
     series."

* tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  xtensa: Use generic asm/mmu.h for nommu
  h8300: Use generic asm/mmu.h
  c6x: Use generic asm/mmu.h
  asm-generic/mmu.h: Add support for FDPIC
  asm-generic/mmu.h: Remove unused vmlist field from mm_context_t
  asm-generic: io: remove {read,write} string functions
  asm-generic/io.h: remove asm/cacheflush.h include
---

0264405b84505f60ae00625f261e75a32c7ddf56
diff --cc arch/h8300/include/asm/Kbuild
index bebdc36ebb0a,173de77e5933..995eb47e01bb
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@@ -1,5 -1,6 +1,6 @@@
  
  generic-y += clkdev.h
  generic-y += exec.h
+ generic-y += mmu.h
  generic-y += module.h
 +generic-y += trace_clock.h