From 5716d415f8c5a17d44f6e1d5a1e4998f7306a93b Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Sun, 11 Jul 2010 09:51:14 +0200 Subject: pcmcia: remove obsolete ioctl Signed-off-by: Dominik Brodowski --- include/pcmcia/ss.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'include/pcmcia/ss.h') 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 */ -- cgit v1.2.3