diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-05 18:02:03 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-05 18:02:03 -0500 |
commit | 8e9e793d68fcda6cc84c18cedf85ca0f91d801a8 (patch) | |
tree | 3dcceaaa676f1221e532e24106bb661143733eaf /drivers/pcmcia/cs_internal.h | |
parent | 98e4c28b7ec390c2dad6a4c69d69629c0f7e8b10 (diff) |
[PATCH] pcmcia: merge suspend into device model
Merge the suspend and resume methods for 16-bit PCMCIA cards into the
device model -- for both runtime power management and suspend to ram/disk.
Bugfix in ds.c by Richard Purdie
Signed-Off-By: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r-- | drivers/pcmcia/cs_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 634426b78f2c..7b37eba35bf1 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h | |||
@@ -143,6 +143,8 @@ struct pcmcia_callback{ | |||
143 | struct module *owner; | 143 | struct module *owner; |
144 | int (*event) (struct pcmcia_socket *s, event_t event, int priority); | 144 | int (*event) (struct pcmcia_socket *s, event_t event, int priority); |
145 | void (*requery) (struct pcmcia_socket *s); | 145 | void (*requery) (struct pcmcia_socket *s); |
146 | int (*suspend) (struct pcmcia_socket *s); | ||
147 | int (*resume) (struct pcmcia_socket *s); | ||
146 | }; | 148 | }; |
147 | 149 | ||
148 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); | 150 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); |