OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[android-x86/kernel.git]
/
drivers
/
pcmcia
/
vrc4171_card.c
diff --git
a/drivers/pcmcia/vrc4171_card.c
b/drivers/pcmcia/vrc4171_card.c
index
d4ad50d
..
c9fcbdc
100644
(file)
--- a/
drivers/pcmcia/vrc4171_card.c
+++ b/
drivers/pcmcia/vrc4171_card.c
@@
-707,7
+707,7
@@
__setup("vrc4171_card=", vrc4171_card_setup);
static int vrc4171_card_suspend(struct platform_device *dev,
pm_message_t state)
{
- return pcmcia_socket_dev_suspend(&dev->dev
, state
);
+ return pcmcia_socket_dev_suspend(&dev->dev);
}
static int vrc4171_card_resume(struct platform_device *dev)