diff options
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 52ebe75664e8..d18330b401b1 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -91,12 +91,11 @@ struct pcmcia_device { | |||
91 | dev_node_t *dev_node; | 91 | dev_node_t *dev_node; |
92 | u_int open; | 92 | u_int open; |
93 | io_req_t io; | 93 | io_req_t io; |
94 | irq_req_t irq; | ||
95 | config_req_t conf; | 94 | config_req_t conf; |
96 | window_handle_t win; | 95 | window_handle_t win; |
97 | 96 | ||
98 | /* device setup */ | 97 | /* device setup */ |
99 | unsigned int irq_v; /* do not use directly yet */ | 98 | unsigned int irq; |
100 | 99 | ||
101 | /* Is the device suspended? */ | 100 | /* Is the device suspended? */ |
102 | u16 suspended:1; | 101 | u16 suspended:1; |
@@ -194,7 +193,13 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, | |||
194 | 193 | ||
195 | /* device configuration */ | 194 | /* device configuration */ |
196 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); | 195 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); |
197 | int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req); | 196 | |
197 | int __must_check __deprecated | ||
198 | pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev, | ||
199 | irq_handler_t handler); | ||
200 | int __must_check pcmcia_request_irq(struct pcmcia_device *p_dev, | ||
201 | irq_handler_t handler); | ||
202 | |||
198 | int pcmcia_request_configuration(struct pcmcia_device *p_dev, | 203 | int pcmcia_request_configuration(struct pcmcia_device *p_dev, |
199 | config_req_t *req); | 204 | config_req_t *req); |
200 | 205 | ||