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
/
sa1100_generic.c
diff --git
a/drivers/pcmcia/sa1100_generic.c
b/drivers/pcmcia/sa1100_generic.c
index
874990e
..
f1bb791
100644
(file)
--- 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)