summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 15:25:37 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:37 -0700
commit3bfffd97ef913045080861d1898286ac8975c22a (patch)
tree482accb34d082f7460c8acc8db6e00331dbf3e29 /include
parent9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (diff)
downloadop-kernel-dev-3bfffd97ef913045080861d1898286ac8975c22a.zip
op-kernel-dev-3bfffd97ef913045080861d1898286ac8975c22a.tar.gz
[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.h2
-rw-r--r--include/linux/mmc/host.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/bus-sh.h b/include/asm-sh/bus-sh.h
index f782a33..83c5d2f 100644
--- a/include/asm-sh/bus-sh.h
+++ b/include/asm-sh/bus-sh.h
@@ -34,7 +34,7 @@ struct sh_driver {
unsigned int bus_id;
int (*probe)(struct sh_dev *);
int (*remove)(struct sh_dev *);
- int (*suspend)(struct sh_dev *, u32);
+ int (*suspend)(struct sh_dev *, pm_message_t);
int (*resume)(struct sh_dev *);
};
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f67686c..f90f674 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 *);
#define mmc_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev)
-extern int mmc_suspend_host(struct mmc_host *, u32);
+extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_resume_host(struct mmc_host *);
extern void mmc_detect_change(struct mmc_host *);
OpenPOWER on IntegriCloud