summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2009-03-28 23:14:41 +0800
committerBryan Wu <cooloney@kernel.org>2009-03-28 23:14:41 +0800
commitb89df5042300bc08492a567f409c6899863ed8a3 (patch)
tree87d0b2733d45d8dfae2805f74c15bc78cb75c865
parent3ea57218fde5fe6c2ff449d4c30fc69ac6976096 (diff)
downloadlinux-b89df5042300bc08492a567f409c6899863ed8a3.tar.gz
linux-b89df5042300bc08492a567f409c6899863ed8a3.tar.bz2
linux-b89df5042300bc08492a567f409c6899863ed8a3.zip
Blackfin arch: Blacklist Hibernate (PM_SUSPEND_MEM) on BF561 as well
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r--arch/blackfin/mach-common/pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index f48a6aebb49b..bce5a84be49f 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -287,7 +287,7 @@ int bfin_pm_suspend_mem_enter(void)
static int bfin_pm_valid(suspend_state_t state)
{
return (state == PM_SUSPEND_STANDBY
-#ifndef BF533_FAMILY
+#if !(defined(BF533_FAMILY) || defined(CONFIG_BF561))
/*
* On BF533/2/1:
* If we enter Hibernate the SCKE Pin is driven Low,