diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
| commit | c5b970dd2f809ce3675902f672a1d676aed43c7a (patch) | |
| tree | 89311b14d29ab1d8ea2966e22941ac5b2214db25 /drivers/cpuidle/Makefile | |
| parent | 3bc528d32c5c98a496c3473353e701a6e23c0cb3 (diff) | |
| parent | 892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.9-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 |