diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:26 -0400 |
| commit | 8bf28030f3683f69669d08cb5b32bc46db3d22ae (patch) | |
| tree | a42dc815087588ab706d421eb9229637de704df4 /drivers/pcmcia/sa1111_generic.c | |
| parent | 05adc3b7458e97a1d0180828000207a403083389 (diff) | |
[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/sa1111_generic.c')
| -rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index bd9d6b2fad68..b441f43a6a55 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
| @@ -158,7 +158,7 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev) | |||
| 158 | return 0; | 158 | return 0; |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | static int pcmcia_suspend(struct sa1111_dev *dev, u32 state) | 161 | static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state) |
| 162 | { | 162 | { |
| 163 | return pcmcia_socket_dev_suspend(&dev->dev, state); | 163 | return pcmcia_socket_dev_suspend(&dev->dev, state); |
| 164 | } | 164 | } |