diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 12:03:40 +0530 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 12:03:40 +0530 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /drivers/pcmcia/sa1100_generic.c | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/pcmcia/sa1100_generic.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index d8da5ac844e..2d0e9975153 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c @@ -89,7 +89,7 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) static int sa11x0_drv_pcmcia_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 sa11x0_drv_pcmcia_resume(struct platform_device *dev) |