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 /include/pcmcia/cs.h | |
| parent | fbd91ac22229fdb89f0dd2eaa11dd663f2ba1a92 (diff) | |
| parent | 725a6abfe37025975c125ace1c7da35f27ce5384 (diff) | |
| download | blackbird-op-linux-d7906de1d774ca70d696d3047223bb3e5e759d92.tar.gz blackbird-op-linux-d7906de1d774ca70d696d3047223bb3e5e759d92.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
Diffstat (limited to 'include/pcmcia/cs.h')
| -rw-r--r-- | include/pcmcia/cs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index 2cab39f49eb2..52660f32663d 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h @@ -382,7 +382,6 @@ enum service { struct pcmcia_socket; int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, conf_reg_t *reg); -int pcmcia_deregister_client(struct pcmcia_device *p_dev); int pcmcia_get_configuration_info(struct pcmcia_device *p_dev, config_info_t *config); int pcmcia_get_first_window(window_handle_t *win, win_req_t *req); int pcmcia_get_next_window(window_handle_t *win, win_req_t *req); @@ -390,7 +389,6 @@ int pcmcia_get_status(struct pcmcia_device *p_dev, cs_status_t *status); int pcmcia_get_mem_page(window_handle_t win, memreq_t *req); int pcmcia_map_mem_page(window_handle_t win, memreq_t *req); int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); -int pcmcia_register_client(client_handle_t *handle, client_reg_t *req); int pcmcia_release_configuration(struct pcmcia_device *p_dev); int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req); int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req); |
