diff options
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r-- | drivers/pcmcia/cs_internal.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index f95864c2191e..4126a75445ea 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h | |||
@@ -52,13 +52,11 @@ struct cis_cache_entry { | |||
52 | 52 | ||
53 | struct pccard_resource_ops { | 53 | struct pccard_resource_ops { |
54 | int (*validate_mem) (struct pcmcia_socket *s); | 54 | int (*validate_mem) (struct pcmcia_socket *s); |
55 | int (*adjust_io_region) (struct resource *res, | 55 | int (*find_io) (struct pcmcia_socket *s, |
56 | unsigned long r_start, | 56 | unsigned int attr, |
57 | unsigned long r_end, | 57 | unsigned int *base, |
58 | struct pcmcia_socket *s); | 58 | unsigned int num, |
59 | struct resource* (*find_io) (unsigned long base, int num, | 59 | unsigned int align); |
60 | unsigned long align, | ||
61 | struct pcmcia_socket *s); | ||
62 | struct resource* (*find_mem) (unsigned long base, unsigned long num, | 60 | struct resource* (*find_mem) (unsigned long base, unsigned long num, |
63 | unsigned long align, int low, | 61 | unsigned long align, int low, |
64 | struct pcmcia_socket *s); | 62 | struct pcmcia_socket *s); |
@@ -89,6 +87,14 @@ struct pccard_resource_ops { | |||
89 | 87 | ||
90 | 88 | ||
91 | /* | 89 | /* |
90 | * Stuff internal to module "pcmcia_rsrc": | ||
91 | */ | ||
92 | extern int static_init(struct pcmcia_socket *s); | ||
93 | extern struct resource *pcmcia_make_resource(unsigned long start, | ||
94 | unsigned long end, | ||
95 | int flags, const char *name); | ||
96 | |||
97 | /* | ||
92 | * Stuff internal to module "pcmcia_core": | 98 | * Stuff internal to module "pcmcia_core": |
93 | */ | 99 | */ |
94 | 100 | ||
@@ -149,6 +155,8 @@ extern struct resource *pcmcia_find_mem_region(u_long base, | |||
149 | int low, | 155 | int low, |
150 | struct pcmcia_socket *s); | 156 | struct pcmcia_socket *s); |
151 | 157 | ||
158 | void pcmcia_cleanup_irq(struct pcmcia_socket *s); | ||
159 | int pcmcia_setup_irq(struct pcmcia_device *p_dev); | ||
152 | 160 | ||
153 | /* cistpl.c */ | 161 | /* cistpl.c */ |
154 | extern struct bin_attribute pccard_cis_attr; | 162 | extern struct bin_attribute pccard_cis_attr; |