diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-04-30 18:09:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-30 19:40:40 -0400 |
| commit | 11d77d0c01b80e44c7aceb21928508dafce774f9 (patch) | |
| tree | 4952f15df4ea2fcdba824aec5689ee9c0c7ceb90 /include/linux/pm.h | |
| parent | fe0c935a6cbf25d72a27c7a345df8a2151de0b74 (diff) | |
power management: remove firmware disk mode
This patch removes the firmware disk suspend mode which is the wrong approach,
it is supposed to be used for implementing firmware-based disk suspend but
cannot actually be used for that.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: <linux-pm@lists.linux-foundation.org>
Cc: David Brownell <david-b@pacbell.net>
Cc: Len Brown <lenb@kernel.org>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Greg KH <greg@kroah.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index dfced9188bdc..c2a55f94c29a 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -114,13 +114,12 @@ typedef int __bitwise suspend_disk_method_t; | |||
| 114 | 114 | ||
| 115 | /* invalid must be 0 so struct pm_ops initialisers can leave it out */ | 115 | /* invalid must be 0 so struct pm_ops initialisers can leave it out */ |
| 116 | #define PM_DISK_INVALID ((__force suspend_disk_method_t) 0) | 116 | #define PM_DISK_INVALID ((__force suspend_disk_method_t) 0) |
| 117 | #define PM_DISK_FIRMWARE ((__force suspend_disk_method_t) 1) | 117 | #define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 1) |
| 118 | #define PM_DISK_PLATFORM ((__force suspend_disk_method_t) 2) | 118 | #define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 2) |
| 119 | #define PM_DISK_SHUTDOWN ((__force suspend_disk_method_t) 3) | 119 | #define PM_DISK_REBOOT ((__force suspend_disk_method_t) 3) |
| 120 | #define PM_DISK_REBOOT ((__force suspend_disk_method_t) 4) | 120 | #define PM_DISK_TEST ((__force suspend_disk_method_t) 4) |
| 121 | #define PM_DISK_TEST ((__force suspend_disk_method_t) 5) | 121 | #define PM_DISK_TESTPROC ((__force suspend_disk_method_t) 5) |
| 122 | #define PM_DISK_TESTPROC ((__force suspend_disk_method_t) 6) | 122 | #define PM_DISK_MAX ((__force suspend_disk_method_t) 6) |
| 123 | #define PM_DISK_MAX ((__force suspend_disk_method_t) 7) | ||
| 124 | 123 | ||
| 125 | /** | 124 | /** |
| 126 | * struct pm_ops - Callbacks for managing platform dependent suspend states. | 125 | * struct pm_ops - Callbacks for managing platform dependent suspend states. |