• Arnd Bergmann's avatar
    Merge branch 'davinci/cleanups' into next/cleanup · a3a3c466
    Arnd Bergmann authored
    * davinci/cleanups:
      ARM: davinci: add back dummy header files
      ARM: davinci: dm644x: don't force vpfe registeration on all boards
      ARM: davinci: dm644x: fix inconsistent variable naming
      ARM: davinci: dm644x: improve readability using macro
      ARM: davinci: streamline sysmod access
      ARM: davinci: create new common platform header for davinci
      ARM: davinci: dm646x: move private definitions to C file
      ARM: davinci: dm365: move private definitions to C file
      ARM: davinci: dm644x: move private definitions to C file
    
    Conflicts:
    	arch/arm/mach-davinci/board-dm644x-evm.c
    	arch/arm/mach-davinci/board-neuros-osd2.c
    	arch/arm/mach-davinci/board-sffsdr.c
    a3a3c466
board-dm365-evm.c 14.7 KB