summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-06-20 19:30:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-06-20 19:30:20 +0100
commit5c3fddced9f62f4b175ce400bb96b23f47626e50 (patch)
tree52bad626b8b5111eb727f4a5fcc586f60c88c426 /arch/arm
parent907d6deb625cd7ff5fea3ef4b20dfb6c1c19c3ee (diff)
downloadlinux-5c3fddced9f62f4b175ce400bb96b23f47626e50.tar.gz
linux-5c3fddced9f62f4b175ce400bb96b23f47626e50.tar.bz2
linux-5c3fddced9f62f4b175ce400bb96b23f47626e50.zip
[ARM] 3607/1: AT91RM9200 misc fixes
Patch from Andrew Victor This final patch includes some general fixes. 1. Link in pm.o if CONFIG_PM is enabled. [Should have been included in patch 3605/1]. 2. Use __raw_readl()/__raw_writel() when accessing System Peripheral registers. 3. Removed some unnecessary includes Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-at91rm9200/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91rm9200/Makefile
index c8f544b789c0..81ebc6684ad2 100644
--- a/arch/arm/mach-at91rm9200/Makefile
+++ b/arch/arm/mach-at91rm9200/Makefile
@@ -7,6 +7,8 @@ obj-m :=
obj-n :=
obj- :=
+obj-$(CONFIG_PM) += pm.o
+
# Board-specific support
obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o
obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o
@@ -28,3 +30,8 @@ obj-$(CONFIG_LEDS) += $(led-y)
# VGA support
#obj-$(CONFIG_FB_S1D13XXX) += ics1523.o
+
+
+ifeq ($(CONFIG_PM_DEBUG),y)
+CFLAGS_pm.o += -DDEBUG
+endif