From: Mark Brown <broonie@linaro.org>
Date: Sat, 24 May 2014 13:11:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~119^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=088d7dadf9ce9e4923355f1e9ad02cd130dcfd7e;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig
---

088d7dadf9ce9e4923355f1e9ad02cd130dcfd7e
diff --cc arch/arm64/Kconfig
index 12361e281f57,21201a0cb3f7..a6633c6b9c5d
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -12,10 -11,9 +12,11 @@@ config ARM6
  	select BUILDTIME_EXTABLE_SORT
  	select CLONE_BACKWARDS
  	select COMMON_CLK
 +	select CPU_PM if (SUSPEND || CPU_IDLE)
  	select DCACHE_WORD_ACCESS
  	select GENERIC_CLOCKEVENTS
 +	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ 	select GENERIC_EARLY_IOREMAP
  	select GENERIC_IOMAP
  	select GENERIC_IRQ_PROBE
  	select GENERIC_IRQ_SHOW