diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 14:27:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 14:27:34 -0700 |
commit | f23a5e1405e47df6cdc86568ea75df266b9e151f (patch) | |
tree | 788fab831a235ce8f143e8562d832336a595cff7 /arch/powerpc/kernel | |
parent | d24c2af42292cb4ad9c829d71fe0d795112ca6e7 (diff) | |
parent | 0775a60aca2375ea5598741b30d13fe6d3f15617 (diff) | |
download | kernel_samsung_crespo-f23a5e1405e47df6cdc86568ea75df266b9e151f.zip kernel_samsung_crespo-f23a5e1405e47df6cdc86568ea75df266b9e151f.tar.gz kernel_samsung_crespo-f23a5e1405e47df6cdc86568ea75df266b9e151f.tar.bz2 |
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/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/swsusp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c index 560c961..aa17b76 100644 --- a/arch/powerpc/kernel/swsusp.c +++ b/arch/powerpc/kernel/swsusp.c @@ -10,7 +10,6 @@ */ #include <linux/sched.h> -#include <asm/suspend.h> #include <asm/system.h> #include <asm/current.h> #include <asm/mmu_context.h> |