Merge branch 'bugzilla-11715' into test

[sfrench/cifs-2.6.git] / arch / sh / boards / mach-hp6xx / pm.c

diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
index e96684def788c064cbe1a036e5f0eea71d99bf1f..64af1f2eef05707b3925ab9ccd6ed3e1ec0ef420 100644 (file)
--- a/arch/sh/boards/mach-hp6xx/pm.c
+++ b/arch/sh/boards/mach-hp6xx/pm.c
@@ -12,7 +12,7 @@
 #include <linux/time.h>
 #include <asm/io.h>
 #include <asm/hd64461.h>
-#include <asm/hp6xx.h>
+#include <mach/hp6xx.h>
 #include <cpu/dac.h>
 #include <asm/pm.h>