← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to drivers/pcmcia/au1000_generic.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pcmcia/au1000_generic.c
515
515
static int au1x00_drv_pcmcia_suspend(struct platform_device *dev,
516
516
                                     pm_message_t state)
517
517
{
518
 
        return pcmcia_socket_dev_suspend(&dev->dev);
 
518
        return pcmcia_socket_dev_suspend(&dev->dev, state);
519
519
}
520
520
 
521
521
static int au1x00_drv_pcmcia_resume(struct platform_device *dev)