From: Mark Brown <broonie@kernel.org>
Date: Sun, 18 Jan 2015 13:12:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~35^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=cc43a17507644ad34d07a3e95d7376d55fd82b15;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm64/kernel/Makefile
	drivers/cpuidle/Makefile
---

cc43a17507644ad34d07a3e95d7376d55fd82b15
diff --cc arch/arm64/kernel/Makefile
index ac389d32ccde,fc6d27105563..a8ad571c4758
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -19,19 -13,13 +19,20 @@@ arm64-obj-y		:= cputable.o debug-monito
  
  arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\
  					   sys_compat.o
 +arm64-obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o entry-ftrace.o
  arm64-obj-$(CONFIG_MODULES)		+= arm64ksyms.o module.o
  arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o
 +arm64-obj-$(CONFIG_SMP)			+= topology.o
 +arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
 -arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
 +arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o
  arm64-obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 +arm64-obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
 +arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)	+= sleep.o suspend.o
 +arm64-obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o
+ arm64-obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  arm64-obj-$(CONFIG_KGDB)		+= kgdb.o
 +arm64-obj-$(CONFIG_EFI)			+= efi.o efi-stub.o efi-entry.o
  
  obj-y					+= $(arm64-obj-y) vdso/
  obj-m					+= $(arm64-obj-m)
diff --cc drivers/cpuidle/Makefile
index 2d97bcfecd00,825433777ef2..0bd32cd03f0a
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -4,8 -4,7 +4,8 @@@
  
  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
 +obj-$(CONFIG_BIG_LITTLE) += arm_big_little.o
- obj-$(CONFIG_OF_IDLE_STATES)		  += of_idle_states.o
+ obj-$(CONFIG_DT_IDLE_STATES)		  += dt_idle_states.o
  
  obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
  obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o