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

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / pm.c

diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 852ea72d8c80bfbc87a2b9741a1a53c371f60a04..6bf15ae73848efc667689d28661944e00a84d167 100644 (file)
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -10,7 +10,6 @@
  * 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/module.h>
 #include <linux/suspend.h>
@@ -84,7 +83,8 @@ int pxa_pm_enter(suspend_state_t state)
 
 #ifdef CONFIG_IWMMXT
        /* force any iWMMXt context to ram **/
-       iwmmxt_task_disable(NULL);
+       if (elf_hwcap & HWCAP_IWMMXT)
+               iwmmxt_task_disable(NULL);
 #endif
 
        /* preserve current time */
@@ -223,14 +223,11 @@ int pxa_pm_finish(suspend_state_t state)
 
 EXPORT_SYMBOL_GPL(pxa_pm_finish);
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops pxa_pm_ops = {
-       .pm_disk_mode   = PM_DISK_FIRMWARE,
        .prepare        = pxa_pm_prepare,
        .enter          = pxa_pm_enter,
        .finish         = pxa_pm_finish,
+       .valid          = pm_valid_only_mem,
 };
 
 static int __init pxa_pm_init(void)