• Arnd Bergmann's avatar
    Merge branch 'treewide/cleanup' into next/multiplatform · 11c7a6c5
    Arnd Bergmann authored
    The realview multiplatform series has a trivial conflict with
    one of the treewide cleanups, let's just merge that in to
    avoid having to resolve this later.
    
    * treewide/cleanup:
      ARM: use "depends on" for SoC configs instead of "if" after prompt
      ARM/clocksource: use automatic DT probing for ux500 PRCMU
      ARM: use const and __initconst for smp_operations
      ARM: hisi: do not export smp_operations structures
    
    Conflicts:
    	arch/arm/mach-integrator/Kconfig
    11c7a6c5
Kconfig 60.1 KB