summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/sa1111_generic.c
diff options
context:
space:
mode:
authorPavel Machek2005-04-17 00:25:26 +0200
committerLinus Torvalds2005-04-17 00:25:26 +0200
commit8bf28030f3683f69669d08cb5b32bc46db3d22ae (patch)
treea42dc815087588ab706d421eb9229637de704df4 /drivers/pcmcia/sa1111_generic.c
parent[PATCH] u32 vs. pm_message_t fixes for drivers/net (diff)
downloadkernel-qcow2-linux-8bf28030f3683f69669d08cb5b32bc46db3d22ae.tar.gz
kernel-qcow2-linux-8bf28030f3683f69669d08cb5b32bc46db3d22ae.tar.xz
kernel-qcow2-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/sa1111_generic.c')
-rw-r--r--drivers/pcmcia/sa1111_generic.c2
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)
return 0;
}
-static int pcmcia_suspend(struct sa1111_dev *dev, u32 state)
+static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state)
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
}