diff options
author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:39 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:39 +0100 |
commit | 2991452354889cf001262b7aeee22e506d6a321e (patch) | |
tree | 7503e49ac04784f3a5e2812da614adfd4164a07b /drivers/cpuidle/Makefile | |
parent | c65283a962e8e391283db37939f8483249b0d276 (diff) | |
parent | 892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff) |
Merge branch 'tracking-armlt-tc2-pm' into integration-linux-vexpress
Conflicts:
arch/arm/mach-vexpress/Kconfig
arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'drivers/cpuidle/Makefile')
-rw-r--r-- | drivers/cpuidle/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 24c6e7d945e..6a7e6a9beff 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -4,6 +4,6 @@ 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_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o |