diff --git a/[refs] b/[refs]
index c0d48de39796..1857b08a1d86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70fe4d87bf72053f78cf3d2e6cefa5d51a2c30af
+refs/heads/master: 3dde7a3c74bcc25c6fc31b836fec8c91fb0b2b8f
diff --git a/trunk/arch/sh/boards/hp6xx/Makefile b/trunk/arch/sh/boards/hp6xx/Makefile
index ff1b7f5b4e91..b3124278247c 100644
--- a/trunk/arch/sh/boards/hp6xx/Makefile
+++ b/trunk/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