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/omap_cf.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/omap_cf.c')
| -rw-r--r-- | drivers/pcmcia/omap_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index f3736398900e..68570bc3ac86 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c | |||
| @@ -334,7 +334,7 @@ static int __exit omap_cf_remove(struct platform_device *pdev) | |||
| 334 | 334 | ||
| 335 | static int omap_cf_suspend(struct platform_device *pdev, pm_message_t mesg) | 335 | static int omap_cf_suspend(struct platform_device *pdev, pm_message_t mesg) |
| 336 | { | 336 | { |
| 337 | return pcmcia_socket_dev_suspend(&pdev->dev, mesg); | 337 | return pcmcia_socket_dev_suspend(&pdev->dev); |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | static int omap_cf_resume(struct platform_device *pdev) | 340 | static int omap_cf_resume(struct platform_device *pdev) |