summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/Makefile
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-07-06 15:35:18 -0700
committerTony Luck <tony.luck@intel.com>2005-07-06 15:35:18 -0700
commit67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch)
treea96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-pxa/Makefile
parent2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff)
parent159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff)
downloadop-kernel-dev-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip
op-kernel-dev-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.gz
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
-rw-r--r--arch/arm/mach-pxa/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index c4e6d25..efc2f65 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -24,3 +24,7 @@ obj-$(CONFIG_LEDS) += $(led-y)
# Misc features
obj-$(CONFIG_PM) += pm.o sleep.o
+
+ifeq ($(CONFIG_PXA27x),y)
+obj-$(CONFIG_PM) += standby.o
+endif
OpenPOWER on IntegriCloud