Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

[linux-2.6-omap-h63xx.git] / arch / sh / boards / hp6xx / pm.c

diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c
index 0e501bcbd7a964a8dfe9da141cd9742a13eceb83..8143d1b948e7e2b4d33820abba8d5984866c8eaf 100644 (file)
--- a/arch/sh/boards/hp6xx/pm.c
+++ b/arch/sh/boards/hp6xx/pm.c
@@ -6,14 +6,13 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/suspend.h>
 #include <linux/errno.h>
 #include <linux/time.h>
 #include <asm/io.h>
 #include <asm/hd64461.h>
-#include <asm/hp6xx/hp6xx.h>
+#include <asm/hp6xx.h>
 #include <asm/cpu/dac.h>
 #include <asm/pm.h>
 
@@ -28,9 +27,6 @@ static int hp6x0_pm_enter(suspend_state_t state)
        u16 hd64461_stbcr;
 #endif
 
-       if (state != PM_SUSPEND_MEM)
-               return -EINVAL;
-
 #ifdef CONFIG_HD64461_ENABLER
        outb(0, HD64461_PCC1CSCIER);
 
@@ -71,12 +67,9 @@ static int hp6x0_pm_enter(suspend_state_t state)
        return 0;
 }
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops hp6x0_pm_ops = {
-       .pm_disk_mode   = PM_DISK_FIRMWARE,
        .enter          = hp6x0_pm_enter,
+       .valid          = pm_valid_only_mem,
 };
 
 static int __init hp6x0_pm_init(void)