summaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ss.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-11 09:51:14 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2010-07-30 21:07:26 +0200
commit5716d415f8c5a17d44f6e1d5a1e4998f7306a93b (patch)
tree81a946cccfd7ddb6f1b01839f68afa27fc42a180 /include/pcmcia/ss.h
parentb37fa16e78d6f9790462b3181602a26b5af36260 (diff)
downloadlinux-5716d415f8c5a17d44f6e1d5a1e4998f7306a93b.tar.gz
linux-5716d415f8c5a17d44f6e1d5a1e4998f7306a93b.tar.bz2
linux-5716d415f8c5a17d44f6e1d5a1e4998f7306a93b.zip
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.h8
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 {
/* 16-bit state: */
struct {
- /* "master" ioctl is used */
- u8 busy:1;
/* the PCMCIA card consists of two pseudo devices */
u8 has_pfc:1;
- u8 reserved:6;
+ u8 reserved:7;
} pcmcia_state;
/* non-zero if PCMCIA card is present */
@@ -234,10 +232,6 @@ struct pcmcia_socket {
/* IRQ to be used by PCMCIA devices. May not be IRQ 0. */
unsigned int pcmcia_irq;
-#ifdef CONFIG_PCMCIA_IOCTL
- struct user_info_t *user;
- wait_queue_head_t queue;
-#endif /* CONFIG_PCMCIA_IOCTL */
#endif /* CONFIG_PCMCIA */
/* socket device */