summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer.ericson@gmail.com>2007-05-01 05:21:26 +0200
committerPaul Mundt <lethal@hera.kernel.org>2007-05-07 04:11:57 +0200
commit3dde7a3c74bcc25c6fc31b836fec8c91fb0b2b8f (patch)
tree28ccec14e5556024b2e696a7339b86b957ec66f1 /arch/sh
parentsh: Wire up more IRQs for SH7709. (diff)
downloadlinux-3dde7a3c74bcc25c6fc31b836fec8c91fb0b2b8f.tar.xz
linux-3dde7a3c74bcc25c6fc31b836fec8c91fb0b2b8f.zip
sh: Fix APM emulation on hp6xx.
With the shared APM emulation code being introduced, hp6xx was missed in the conversion. Get it building again. Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/hp6xx/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/hp6xx/Makefile b/arch/sh/boards/hp6xx/Makefile
index ff1b7f5b4e91..b3124278247c 100644
--- a/arch/sh/boards/hp6xx/Makefile
+++ b/arch/sh/boards/hp6xx/Makefile
@@ -2,6 +2,6 @@
# Makefile for the HP6xx specific parts of the kernel
#
-obj-y := setup.o
+obj-y := setup.o
obj-$(CONFIG_PM) += pm.o pm_wakeup.o
-obj-$(CONFIG_APM) += hp6xx_apm.o
+obj-$(CONFIG_APM_EMULATION) += hp6xx_apm.o