diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 15:55:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 15:55:49 -0800 |
| commit | d7906de1d774ca70d696d3047223bb3e5e759d92 (patch) | |
| tree | 6065caea25668f9fd33c23a24047cecb2c5b5cd7 /drivers/pcmcia/cs_internal.h | |
| parent | fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 (diff) | |
| parent | 725a6abfe37025975c125ace1c7da35f27ce5384 (diff) | |
| download | op-kernel-dev-d7906de1d774ca70d696d3047223bb3e5e759d92.zip op-kernel-dev-d7906de1d774ca70d696d3047223bb3e5e759d92.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
| -rw-r--r-- | drivers/pcmcia/cs_internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 55867bc..7b37eba 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -117,7 +117,7 @@ int verify_cis_cache(struct pcmcia_socket *s); int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse); /* In rsrc_mgr */ -void pcmcia_validate_mem(struct pcmcia_socket *s); +int pcmcia_validate_mem(struct pcmcia_socket *s); struct resource *pcmcia_find_io_region(unsigned long base, int num, unsigned long align, struct pcmcia_socket *s); int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, @@ -143,6 +143,8 @@ struct pcmcia_callback{ struct module *owner; int (*event) (struct pcmcia_socket *s, event_t event, int priority); void (*requery) (struct pcmcia_socket *s); + int (*suspend) (struct pcmcia_socket *s); + int (*resume) (struct pcmcia_socket *s); }; int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); |
