summaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-10 01:08:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-10 01:08:13 +0200
commita35c6322e52c550b61a04a44df27d22394ee0a2c (patch)
treeda74b2167097281f38ddffcb13b7b43861ce931f /drivers/cpuidle/Makefile
parentMerge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux (diff)
parentMerge tag 'msi-3.12' of git://git.infradead.org/linux-mvebu into next/drivers (diff)
downloadlinux-a35c6322e52c550b61a04a44df27d22394ee0a2c.tar.xz
linux-a35c6322e52c550b61a04a44df27d22394ee0a2c.zip
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver update from Kevin Hilman: "This contains the ARM SoC related driver updates for v3.12. The only thing this cycle are core PM updates and CPUidle support for ARM's TC2 big.LITTLE development platform" * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver ARM: vexpress: tc2: disable GIC CPU IF in tc2_pm_suspend drivers: irq-chip: irq-gic: introduce gic_cpu_if_down()
Diffstat (limited to 'drivers/cpuidle/Makefile')
-rw-r--r--drivers/cpuidle/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index 0b9d200c7e45..cea5ef58876d 100644
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o
obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o
obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o
obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o
+obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o