From 8bf28030f3683f69669d08cb5b32bc46db3d22ae Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:26 -0700 Subject: [PATCH] fix u32 vs. pm_message_t in pcmcia This fixes u32 vs. pm_message_t in pcmcia. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/pcmcia/sa1111_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/pcmcia/sa1111_generic.c') diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index bd9d6b2fad6..b441f43a6a5 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); } -- cgit v1.2.3