aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 07:52:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 07:52:57 -0800
commit38dc63459f185795b24a39f3f4921a433ea9980b (patch)
tree205a8abc9b20c4f5573e4d2fbc03e74388cef2bc /include
parent1d510750941a53a1d3049c1d33c75d6dfcd78618 (diff)
parent2ddac2a6a8f13e95664fe7ad1b728ac84fb1bd07 (diff)
downloadkernel_samsung_tuna-38dc63459f185795b24a39f3f4921a433ea9980b.zip
kernel_samsung_tuna-38dc63459f185795b24a39f3f4921a433ea9980b.tar.gz
kernel_samsung_tuna-38dc63459f185795b24a39f3f4921a433ea9980b.tar.bz2
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: Remove some debug messages producing too much noise PM: Fix warning on suspend errors PM / Hibernate: Add newline to load_image() fail path PM / Hibernate: Fix error handling in save_image() PM / Hibernate: Fix blkdev refleaks PM / yenta: Split resume into early and late parts (rev. 4)
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/ss.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index d696a69..e0f6feb 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -262,6 +262,8 @@ struct pcmcia_socket {
struct device dev;
/* data internal to the socket driver */
void *driver_data;
+ /* status of the card during resume from a system sleep state */
+ int resume_status;
};
@@ -280,6 +282,8 @@ 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);
+extern void pcmcia_socket_dev_early_resume(struct device *dev);
+extern void pcmcia_socket_dev_late_resume(struct device *dev);
extern int pcmcia_socket_dev_resume(struct device *dev);
/* socket drivers use this callback in their IRQ handler */