summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-30 19:11:24 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-30 19:11:24 +0400
commit9c1fe834c1bd7725b411055c66886b64c928083d (patch)
tree4321cc45b60988a28dc384c1b189f33d4c95d830 /include
parent5a4c8d75f4ff512c42065a7125d02dffe27966ce (diff)
parent0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c (diff)
downloadlinux-9c1fe834c1bd7725b411055c66886b64c928083d.tar.xz
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 'include')
-rw-r--r--include/pcmcia/ss.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 9a3b49865173..d696a692d94a 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -279,7 +279,7 @@ extern struct pccard_resource_ops pccard_iodyn_ops;
extern struct pccard_resource_ops pccard_nonstatic_ops;
/* socket drivers are expected to use these callbacks in their .drv struct */
-extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state);
+extern int pcmcia_socket_dev_suspend(struct device *dev);
extern int pcmcia_socket_dev_resume(struct device *dev);
/* socket drivers use this callback in their IRQ handler */