diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 11:11:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 11:11:24 -0400 |
| commit | 9c1fe834c1bd7725b411055c66886b64c928083d (patch) | |
| tree | 4321cc45b60988a28dc384c1b189f33d4c95d830 /drivers/pcmcia/au1000_generic.c | |
| parent | 5a4c8d75f4ff512c42065a7125d02dffe27966ce (diff) | |
| parent | 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c (diff) | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / yenta: Fix cardbus suspend/resume regression
PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
Diffstat (limited to 'drivers/pcmcia/au1000_generic.c')
| -rw-r--r-- | drivers/pcmcia/au1000_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index 90013341cd5f..02088704ac2c 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c | |||
| @@ -515,7 +515,7 @@ static int au1x00_drv_pcmcia_probe(struct platform_device *dev) | |||
| 515 | static int au1x00_drv_pcmcia_suspend(struct platform_device *dev, | 515 | static int au1x00_drv_pcmcia_suspend(struct platform_device *dev, |
| 516 | pm_message_t state) | 516 | pm_message_t state) |
| 517 | { | 517 | { |
| 518 | return pcmcia_socket_dev_suspend(&dev->dev, state); | 518 | return pcmcia_socket_dev_suspend(&dev->dev); |
| 519 | } | 519 | } |
| 520 | 520 | ||
| 521 | static int au1x00_drv_pcmcia_resume(struct platform_device *dev) | 521 | static int au1x00_drv_pcmcia_resume(struct platform_device *dev) |