diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:26 -0700 |
commit | 8bf28030f3683f69669d08cb5b32bc46db3d22ae (patch) | |
tree | a42dc815087588ab706d421eb9229637de704df4 /drivers/pcmcia/sa1100_generic.c | |
parent | 05adc3b7458e97a1d0180828000207a403083389 (diff) | |
download | blackbird-op-linux-8bf28030f3683f69669d08cb5b32bc46db3d22ae.tar.gz blackbird-op-linux-8bf28030f3683f69669d08cb5b32bc46db3d22ae.zip |
[PATCH] fix u32 vs. pm_message_t in pcmcia
This fixes u32 vs. pm_message_t in pcmcia.
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 'drivers/pcmcia/sa1100_generic.c')
-rw-r--r-- | drivers/pcmcia/sa1100_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 874990ebe147..f1bb79153021 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c @@ -75,7 +75,7 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev) return ret; } -static int sa11x0_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level) +static int sa11x0_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level) { int ret = 0; if (level == SUSPEND_SAVE_STATE) |