git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
pcmcia
/
sa1111_generic.c
diff --git
a/drivers/pcmcia/sa1111_generic.c
b/drivers/pcmcia/sa1111_generic.c
index
bd9d6b2
..
b441f43
100644
(file)
--- 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);
}