diff options
author | Joseph Lo <josephl@nvidia.com> | 2013-01-25 14:38:32 +0800 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 11:15:21 -0700 |
commit | 24e30c9417230b359bf6dfeb923e90138df7c112 (patch) | |
tree | 05eca383b68801362b7676e2da9884bc4b7afcf2 | |
parent | 1395868c06bd41390e50e7c7fe9a4783dd620867 (diff) | |
download | linux-stable-24e30c9417230b359bf6dfeb923e90138df7c112.tar.gz linux-stable-24e30c9417230b359bf6dfeb923e90138df7c112.tar.bz2 linux-stable-24e30c9417230b359bf6dfeb923e90138df7c112.zip |
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 <rklein@nvidia.com>
Signed-off-by: Joseph Lo <josephl@nvidia.com>
[swarren: add sleep.o to separate line so each line only contains 1 file]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |