diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-14 08:40:00 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-14 09:41:54 -0800 |
| commit | 0b4b61c0dcbfd409832bfbeb6693d5e3ca1f3b95 (patch) | |
| tree | dda80cae2a5d6c0cb468f815b27ec36c99dfe8f1 /arch | |
| parent | e05cf58d50e3ce3601ebf753728eee0df759e38f (diff) | |
| download | linux-3.10-0b4b61c0dcbfd409832bfbeb6693d5e3ca1f3b95.tar.gz linux-3.10-0b4b61c0dcbfd409832bfbeb6693d5e3ca1f3b95.tar.bz2 linux-3.10-0b4b61c0dcbfd409832bfbeb6693d5e3ca1f3b95.zip | |
ARM: OMAP: Fix compile for OMAP_PM_NOOP if PM is not selected
Commit 6e740f9a8 (ARM: OMAP: Move omap-pm-noop.c local to mach-omap2)
moved omap-pm-noop to be local to mach-omap2. However, the makefile
entry got placed within ifeq ($(CONFIG_PM),y) which was not the
case earlier.
Fix the issue by moving it out of the ifeq ($(CONFIG_PM),y) in
the makefile as these stubs are needed also when PM is not set.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b118ed5f61a..ada6006ab2f 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -63,6 +63,8 @@ obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o endif # Power Management +obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o + ifeq ($(CONFIG_PM),y) obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o sleep24xx.o obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o @@ -70,7 +72,6 @@ obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o obj-$(CONFIG_ARCH_OMAP4) += sleep44xx.o obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o sleep44xx.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o -obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o obj-$(CONFIG_POWER_AVS_OMAP_CLASS3) += smartreflex-class3.o |