ChangeSet 1.2205, 2005/03/30 09:43:06-08:00, [EMAIL PROTECTED]
[PATCH] Fix pm_message_t in generic code
This fixes u32 vs. pm_message_t in generic code. No code changes.
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
Documentation/power/devices.txt | 2 +-
include/linux/device.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -Nru a/Documentation/power/devices.txt b/Documentation/power/devices.txt
--- a/Documentation/power/devices.txt 2005-03-30 12:11:59 -08:00
+++ b/Documentation/power/devices.txt 2005-03-30 12:11:59 -08:00
@@ -15,7 +15,7 @@
struct bus_type {
...
- int (*suspend)(struct device * dev, u32 state);
+ int (*suspend)(struct device * dev, pm_message_t state);
int (*resume)(struct device * dev);
};
diff -Nru a/include/linux/device.h b/include/linux/device.h
--- a/include/linux/device.h 2005-03-30 12:11:59 -08:00
+++ b/include/linux/device.h 2005-03-30 12:11:59 -08:00
@@ -110,7 +110,7 @@
int (*probe) (struct device * dev);
int (*remove) (struct device * dev);
void (*shutdown) (struct device * dev);
- int (*suspend) (struct device * dev, u32 state, u32 level);
+ int (*suspend) (struct device * dev, pm_message_t state, u32
level);
int (*resume) (struct device * dev, u32 level);
};
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
