diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/pcmcia/ss.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index ea5dec8c0d76..32896a773910 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -230,18 +230,13 @@ struct pcmcia_socket { | |||
230 | u8 busy:1; | 230 | u8 busy:1; |
231 | /* pcmcia module is being unloaded */ | 231 | /* pcmcia module is being unloaded */ |
232 | u8 dead:1; | 232 | u8 dead:1; |
233 | /* a multifunction-device add event is pending */ | 233 | /* the PCMCIA card consists of two pseudo devices */ |
234 | u8 device_add_pending:1; | 234 | u8 has_pfc:1; |
235 | /* the pending event adds a mfc (1) or pfc (0) */ | ||
236 | u8 mfc_pfc:1; | ||
237 | 235 | ||
238 | u8 reserved:3; | 236 | u8 reserved:4; |
239 | } pcmcia_state; | 237 | } pcmcia_state; |
240 | 238 | ||
241 | 239 | ||
242 | /* for adding further pseudo-multifunction devices */ | ||
243 | struct work_struct device_add; | ||
244 | |||
245 | #ifdef CONFIG_PCMCIA_IOCTL | 240 | #ifdef CONFIG_PCMCIA_IOCTL |
246 | struct user_info_t *user; | 241 | struct user_info_t *user; |
247 | wait_queue_head_t queue; | 242 | wait_queue_head_t queue; |