diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:37 -0400 |
commit | 3bfffd97ef913045080861d1898286ac8975c22a (patch) | |
tree | 482accb34d082f7460c8acc8db6e00331dbf3e29 /include | |
parent | 9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (diff) |
[PATCH] fix u32 vs. pm_message_t in rest of the tree
This fixes u32 vs. pm_message_t confusion in remaining places. Fortunately
there's few of them.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-sh/bus-sh.h | 2 | ||||
-rw-r--r-- | include/linux/mmc/host.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/bus-sh.h b/include/asm-sh/bus-sh.h index f782a33a98fa..83c5d2fd057f 100644 --- a/include/asm-sh/bus-sh.h +++ b/include/asm-sh/bus-sh.h | |||
@@ -34,7 +34,7 @@ struct sh_driver { | |||
34 | unsigned int bus_id; | 34 | unsigned int bus_id; |
35 | int (*probe)(struct sh_dev *); | 35 | int (*probe)(struct sh_dev *); |
36 | int (*remove)(struct sh_dev *); | 36 | int (*remove)(struct sh_dev *); |
37 | int (*suspend)(struct sh_dev *, u32); | 37 | int (*suspend)(struct sh_dev *, pm_message_t); |
38 | int (*resume)(struct sh_dev *); | 38 | int (*resume)(struct sh_dev *); |
39 | }; | 39 | }; |
40 | 40 | ||
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index f67686cef62a..f90f674eb3b0 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
@@ -98,7 +98,7 @@ extern void mmc_free_host(struct mmc_host *); | |||
98 | #define mmc_priv(x) ((void *)((x) + 1)) | 98 | #define mmc_priv(x) ((void *)((x) + 1)) |
99 | #define mmc_dev(x) ((x)->dev) | 99 | #define mmc_dev(x) ((x)->dev) |
100 | 100 | ||
101 | extern int mmc_suspend_host(struct mmc_host *, u32); | 101 | extern int mmc_suspend_host(struct mmc_host *, pm_message_t); |
102 | extern int mmc_resume_host(struct mmc_host *); | 102 | extern int mmc_resume_host(struct mmc_host *); |
103 | 103 | ||
104 | extern void mmc_detect_change(struct mmc_host *); | 104 | extern void mmc_detect_change(struct mmc_host *); |