diff options
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r-- | include/pcmcia/ss.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 344705cb42f4..764281b29218 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -141,10 +141,6 @@ struct pcmcia_socket { | |||
141 | u_short lock_count; | 141 | u_short lock_count; |
142 | pccard_mem_map cis_mem; | 142 | pccard_mem_map cis_mem; |
143 | void __iomem *cis_virt; | 143 | void __iomem *cis_virt; |
144 | struct { | ||
145 | u_int AssignedIRQ; | ||
146 | u_int Config; | ||
147 | } irq; | ||
148 | io_window_t io[MAX_IO_WIN]; | 144 | io_window_t io[MAX_IO_WIN]; |
149 | pccard_mem_map win[MAX_WIN]; | 145 | pccard_mem_map win[MAX_WIN]; |
150 | struct list_head cis_cache; | 146 | struct list_head cis_cache; |
@@ -235,6 +231,9 @@ struct pcmcia_socket { | |||
235 | /* non-zero if PCMCIA card is present */ | 231 | /* non-zero if PCMCIA card is present */ |
236 | atomic_t present; | 232 | atomic_t present; |
237 | 233 | ||
234 | /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */ | ||
235 | unsigned int pcmcia_irq; | ||
236 | |||
238 | #ifdef CONFIG_PCMCIA_IOCTL | 237 | #ifdef CONFIG_PCMCIA_IOCTL |
239 | struct user_info_t *user; | 238 | struct user_info_t *user; |
240 | wait_queue_head_t queue; | 239 | wait_queue_head_t queue; |