diff options
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r-- | drivers/pcmcia/cs_internal.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 7933a7db49d3..0b4c18edfa49 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h | |||
@@ -123,9 +123,9 @@ void cb_free(struct pcmcia_socket *s); | |||
123 | int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, void *ptr); | 123 | int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, void *ptr); |
124 | 124 | ||
125 | /* In cistpl.c */ | 125 | /* In cistpl.c */ |
126 | int read_cis_mem(struct pcmcia_socket *s, int attr, | 126 | int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, |
127 | u_int addr, u_int len, void *ptr); | 127 | u_int addr, u_int len, void *ptr); |
128 | void write_cis_mem(struct pcmcia_socket *s, int attr, | 128 | void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, |
129 | u_int addr, u_int len, void *ptr); | 129 | u_int addr, u_int len, void *ptr); |
130 | void release_cis_mem(struct pcmcia_socket *s); | 130 | void release_cis_mem(struct pcmcia_socket *s); |
131 | void destroy_cis_cache(struct pcmcia_socket *s); | 131 | void destroy_cis_cache(struct pcmcia_socket *s); |
@@ -134,13 +134,12 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t | |||
134 | 134 | ||
135 | /* In rsrc_mgr */ | 135 | /* In rsrc_mgr */ |
136 | void pcmcia_validate_mem(struct pcmcia_socket *s); | 136 | void pcmcia_validate_mem(struct pcmcia_socket *s); |
137 | struct resource *find_io_region(unsigned long base, int num, unsigned long align, | 137 | struct resource *pcmcia_find_io_region(unsigned long base, int num, unsigned long align, |
138 | struct pcmcia_socket *s); | 138 | struct pcmcia_socket *s); |
139 | int adjust_io_region(struct resource *res, unsigned long r_start, | 139 | int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, |
140 | unsigned long r_end, struct pcmcia_socket *s); | 140 | unsigned long r_end, struct pcmcia_socket *s); |
141 | struct resource *find_mem_region(u_long base, u_long num, u_long align, | 141 | struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, |
142 | int low, struct pcmcia_socket *s); | 142 | int low, struct pcmcia_socket *s); |
143 | int adjust_resource_info(client_handle_t handle, adjust_t *adj); | ||
144 | void release_resource_db(struct pcmcia_socket *s); | 143 | void release_resource_db(struct pcmcia_socket *s); |
145 | 144 | ||
146 | /* In socket_sysfs.c */ | 145 | /* In socket_sysfs.c */ |
@@ -159,7 +158,7 @@ int pccard_access_configuration_register(struct pcmcia_socket *s, unsigned int f | |||
159 | struct pcmcia_callback{ | 158 | struct pcmcia_callback{ |
160 | struct module *owner; | 159 | struct module *owner; |
161 | int (*event) (struct pcmcia_socket *s, event_t event, int priority); | 160 | int (*event) (struct pcmcia_socket *s, event_t event, int priority); |
162 | int (*resources_done) (struct pcmcia_socket *s); | 161 | void (*requery) (struct pcmcia_socket *s); |
163 | }; | 162 | }; |
164 | 163 | ||
165 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); | 164 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); |