diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-02 13:37:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-02 13:37:50 -0400 |
| commit | 86166f9846590fa46f8e24e9346d002e938a8b81 (patch) | |
| tree | ef19ee1c7164e18eb6820d3c808da560efb5e181 /arch/arm/mach-pxa/Makefile | |
| parent | 44f8e1a20cf3afe10a3744bd9317808a39a242bb (diff) | |
| parent | db5795547694cf68388aaf8f59723e850f7466f6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index c4e6d2523585..efc2f657184e 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
| @@ -24,3 +24,7 @@ obj-$(CONFIG_LEDS) += $(led-y) | |||
| 24 | 24 | ||
| 25 | # Misc features | 25 | # Misc features |
| 26 | obj-$(CONFIG_PM) += pm.o sleep.o | 26 | obj-$(CONFIG_PM) += pm.o sleep.o |
| 27 | |||
| 28 | ifeq ($(CONFIG_PXA27x),y) | ||
| 29 | obj-$(CONFIG_PM) += standby.o | ||
| 30 | endif | ||