summaryrefslogtreecommitdiff
path: root/arch/sh/include/asm/suspend.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-03 10:41:03 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-03 10:41:08 +0200
commit27eb4a1e4a56afacb0540c24084b9e0342f9956b (patch)
tree85bd26c6d7cdee8ee4c2d69d195f3e2bdbbc54fe /arch/sh/include/asm/suspend.h
parent64ce312618ef0e11d88def80effcefd1b59fdb1e (diff)
parent55922c9d1b84b89cb946c777fddccb3247e7df2c (diff)
Merge commit 'v3.0-rc1' into perf/core
Merge reason: merge in the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/include/asm/suspend.h')
-rw-r--r--arch/sh/include/asm/suspend.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/suspend.h b/arch/sh/include/asm/suspend.h
index 64eb41a063e8..e14567a7e9a1 100644
--- a/arch/sh/include/asm/suspend.h
+++ b/arch/sh/include/asm/suspend.h
@@ -3,7 +3,6 @@
#ifndef __ASSEMBLY__
#include <linux/notifier.h>
-static inline int arch_prepare_suspend(void) { return 0; }
#include <asm/ptrace.h>