diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-11 03:51:14 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-30 15:07:26 -0400 |
commit | 5716d415f8c5a17d44f6e1d5a1e4998f7306a93b (patch) | |
tree | 81a946cccfd7ddb6f1b01839f68afa27fc42a180 /include/pcmcia/ss.h | |
parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) |
pcmcia: remove obsolete ioctl
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r-- | include/pcmcia/ss.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 764281b29218..66740b764da7 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -220,12 +220,10 @@ struct pcmcia_socket { | |||
220 | 220 | ||
221 | /* 16-bit state: */ | 221 | /* 16-bit state: */ |
222 | struct { | 222 | struct { |
223 | /* "master" ioctl is used */ | ||
224 | u8 busy:1; | ||
225 | /* the PCMCIA card consists of two pseudo devices */ | 223 | /* the PCMCIA card consists of two pseudo devices */ |
226 | u8 has_pfc:1; | 224 | u8 has_pfc:1; |
227 | 225 | ||
228 | u8 reserved:6; | 226 | u8 reserved:7; |
229 | } pcmcia_state; | 227 | } pcmcia_state; |
230 | 228 | ||
231 | /* non-zero if PCMCIA card is present */ | 229 | /* non-zero if PCMCIA card is present */ |
@@ -234,10 +232,6 @@ struct pcmcia_socket { | |||
234 | /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */ | 232 | /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */ |
235 | unsigned int pcmcia_irq; | 233 | unsigned int pcmcia_irq; |
236 | 234 | ||
237 | #ifdef CONFIG_PCMCIA_IOCTL | ||
238 | struct user_info_t *user; | ||
239 | wait_queue_head_t queue; | ||
240 | #endif /* CONFIG_PCMCIA_IOCTL */ | ||
241 | #endif /* CONFIG_PCMCIA */ | 235 | #endif /* CONFIG_PCMCIA */ |
242 | 236 | ||
243 | /* socket device */ | 237 | /* socket device */ |