From: Joseph Lo Date: Fri, 25 Jan 2013 06:38:32 +0000 (+0800) Subject: ARM: tegra: fix compile error when disable CPU_IDLE X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=24e30c9417230b359bf6dfeb923e90138df7c112;p=linux-beck.git ARM: tegra: fix compile error when disable CPU_IDLE The "sleep.S" file has many functions that be shared by different module currently. Not just for CPU idle driver. Make it build as default now. Reported-by: Rhyland Klein Signed-off-by: Joseph Lo [swarren: add sleep.o to separate line so each line only contains 1 file] Signed-off-by: Stephen Warren --- diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index a839bb3d9703..f0520961bafe 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -10,8 +10,8 @@ obj-y += apbio.o obj-y += pm.o obj-y += reset.o obj-y += reset-handler.o +obj-y += sleep.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_CPU_IDLE) += sleep.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_clocks.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_clocks_data.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_speedo.o