Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f23a5e14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d24c2af4 0775a60a

arch/frv/include/asm/suspend.h

deleted100644 → 0
+0 −20
Original line number Original line Diff line number Diff line 
/* suspend.h: suspension stuff

 *

 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#ifndef _ASM_SUSPEND_H

#define _ASM_SUSPEND_H



static inline int arch_prepare_suspend(void)

{

	return 0;

}



#endif /* _ASM_SUSPEND_H */

arch/mips/include/asm/suspend.h

+0 −2
Original line number Original line Diff line number Diff line 
#ifndef __ASM_SUSPEND_H

#ifndef __ASM_SUSPEND_H

#define __ASM_SUSPEND_H

#define __ASM_SUSPEND_H





static inline int arch_prepare_suspend(void) { return 0; }



/* References to section boundaries */

/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;

extern const void __nosave_begin, __nosave_end;

arch/powerpc/include/asm/suspend.h

deleted100644 → 0
+0 −6
Original line number Original line Diff line number Diff line 
#ifndef __ASM_POWERPC_SUSPEND_H

#define __ASM_POWERPC_SUSPEND_H



static inline int arch_prepare_suspend(void) { return 0; }



#endif /* __ASM_POWERPC_SUSPEND_H */

arch/powerpc/kernel/swsusp.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 
 */

 */





#include <linux/sched.h>

#include <linux/sched.h>

#include <asm/suspend.h>

#include <asm/system.h>

#include <asm/system.h>

#include <asm/current.h>

#include <asm/current.h>

#include <asm/mmu_context.h>

#include <asm/mmu_context.h>

arch/s390/include/asm/suspend.h

deleted100644 → 0
+0 −10
Original line number Original line Diff line number Diff line 
#ifndef __ASM_S390_SUSPEND_H

#define __ASM_S390_SUSPEND_H



static inline int arch_prepare_suspend(void)

{

	return 0;

}



#endif