diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 17:27:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 17:27:34 -0400 |
| commit | f23a5e1405e47df6cdc86568ea75df266b9e151f (patch) | |
| tree | 788fab831a235ce8f143e8562d832336a595cff7 /arch/sh | |
| parent | d24c2af42292cb4ad9c829d71fe0d795112ca6e7 (diff) | |
| parent | 0775a60aca2375ea5598741b30d13fe6d3f15617 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Fix PM QOS's user mode interface to work with ASCII input
PM / Hibernate: Update kerneldoc comments in hibernate.c
PM / Hibernate: Remove arch_prepare_suspend()
PM / Hibernate: Update some comments in core hibernate code
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/suspend.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/suspend.h b/arch/sh/include/asm/suspend.h index 64eb41a063e..e14567a7e9a 100644 --- a/arch/sh/include/asm/suspend.h +++ b/arch/sh/include/asm/suspend.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
| 5 | #include <linux/notifier.h> | 5 | #include <linux/notifier.h> |
| 6 | static inline int arch_prepare_suspend(void) { return 0; } | ||
| 7 | 6 | ||
| 8 | #include <asm/ptrace.h> | 7 | #include <asm/ptrace.h> |
| 9 | 8 | ||