diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/pcmcia/cs.h | 1 | ||||
-rw-r--r-- | include/pcmcia/ds.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index a751251efdc8..52660f32663d 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
@@ -389,7 +389,6 @@ int pcmcia_get_status(struct pcmcia_device *p_dev, cs_status_t *status); | |||
389 | int pcmcia_get_mem_page(window_handle_t win, memreq_t *req); | 389 | int pcmcia_get_mem_page(window_handle_t win, memreq_t *req); |
390 | int pcmcia_map_mem_page(window_handle_t win, memreq_t *req); | 390 | int pcmcia_map_mem_page(window_handle_t win, memreq_t *req); |
391 | int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); | 391 | int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); |
392 | int pcmcia_register_client(client_handle_t *handle, client_reg_t *req); | ||
393 | int pcmcia_release_configuration(struct pcmcia_device *p_dev); | 392 | int pcmcia_release_configuration(struct pcmcia_device *p_dev); |
394 | int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req); | 393 | int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req); |
395 | int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req); | 394 | int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req); |
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index c53a0604e441..8e2a96396478 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -133,10 +133,7 @@ typedef struct dev_link_t { | |||
133 | struct pcmcia_socket; | 133 | struct pcmcia_socket; |
134 | 134 | ||
135 | struct pcmcia_driver { | 135 | struct pcmcia_driver { |
136 | dev_link_t *(*attach)(void); | 136 | int (*probe) (struct pcmcia_device *dev); |
137 | int (*event) (event_t event, int priority, | ||
138 | event_callback_args_t *); | ||
139 | |||
140 | void (*remove) (struct pcmcia_device *dev); | 137 | void (*remove) (struct pcmcia_device *dev); |
141 | 138 | ||
142 | int (*suspend) (struct pcmcia_device *dev); | 139 | int (*suspend) (struct pcmcia_device *dev); |
@@ -169,7 +166,6 @@ struct pcmcia_device { | |||
169 | /* deprecated, a cleaned up version will be moved into this | 166 | /* deprecated, a cleaned up version will be moved into this |
170 | struct soon */ | 167 | struct soon */ |
171 | dev_link_t *instance; | 168 | dev_link_t *instance; |
172 | event_callback_args_t event_callback_args; | ||
173 | u_int state; | 169 | u_int state; |
174 | 170 | ||
175 | /* information about this device */ | 171 | /* information about this device */ |