Patchwork ARM: tegra: fix compile error when disable CPU_IDLE

login
register
mail settings
Submitter Joseph Lo
Date Jan. 25, 2013, 6:38 a.m.
Message ID <1359095912-32455-1-git-send-email-josephl@nvidia.com>
Download mbox | patch
Permalink /patch/215558/
State Accepted, archived
Headers show

Comments

Joseph Lo - Jan. 25, 2013, 6:38 a.m.
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 <rklein@nvidia.com>
Signed-off-by: Joseph Lo <josephl@nvidia.com>
---
 arch/arm/mach-tegra/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Stephen Warren - Jan. 28, 2013, 6:25 p.m.
On 01/24/2013 11:38 PM, Joseph Lo wrote:
> 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.

I've applied this to Tegra's for-3.9/cleanup branch.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 432f2a5..200faf2 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -6,10 +6,9 @@  obj-y					+= pmc.o
 obj-y					+= flowctrl.o
 obj-y					+= powergate.o
 obj-y					+= apbio.o
-obj-y					+= pm.o
+obj-y					+= pm.o sleep.o
 obj-y					+= reset.o reset-handler.o
 obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
-obj-$(CONFIG_CPU_IDLE)			+= sleep.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra20_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= sleep-tegra20.o