From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 18 Dec 2015 16:07:52 +0000 (+0100)
Subject: Merge branch 'treewide/cleanup' into next/multiplatform
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11c7a6c5a3232e2ff1127d80d609daa95df5d5d4;p=linux-beck.git

Merge branch 'treewide/cleanup' into next/multiplatform

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
---

11c7a6c5a3232e2ff1127d80d609daa95df5d5d4
diff --cc arch/arm/mach-integrator/Kconfig
index e936cf420b48,2fa9d11c9d14..b01bdc9baf89
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@@ -1,5 -1,6 +1,6 @@@
 -config ARCH_INTEGRATOR
 +menuconfig ARCH_INTEGRATOR
- 	bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6)
+ 	bool "ARM Ltd. Integrator family"
+ 	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
  	select ARM_AMBA
  	select ARM_PATCH_PHYS_VIRT if MMU
  	select AUTO_ZRELADDR