diff options
Diffstat (limited to 'drivers/pcmcia/soc_common.h')
-rw-r--r-- | drivers/pcmcia/soc_common.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 290e143839ee..e40824ce6b0b 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
@@ -30,14 +30,12 @@ struct soc_pcmcia_socket { | |||
30 | /* | 30 | /* |
31 | * Info from low level handler | 31 | * Info from low level handler |
32 | */ | 32 | */ |
33 | struct device *dev; | ||
34 | unsigned int nr; | 33 | unsigned int nr; |
35 | unsigned int irq; | ||
36 | 34 | ||
37 | /* | 35 | /* |
38 | * Core PCMCIA state | 36 | * Core PCMCIA state |
39 | */ | 37 | */ |
40 | struct pcmcia_low_level *ops; | 38 | const struct pcmcia_low_level *ops; |
41 | 39 | ||
42 | unsigned int status; | 40 | unsigned int status; |
43 | socket_state_t cs_state; | 41 | socket_state_t cs_state; |
@@ -135,10 +133,8 @@ extern void soc_pcmcia_enable_irqs(struct soc_pcmcia_socket *skt, struct pcmcia_ | |||
135 | extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_pcmcia_timing *); | 133 | extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_pcmcia_timing *); |
136 | 134 | ||
137 | 135 | ||
138 | extern struct list_head soc_pcmcia_sockets; | 136 | void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt); |
139 | 137 | int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt); | |
140 | extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, struct skt_dev_info *sinfo); | ||
141 | extern int soc_common_drv_pcmcia_remove(struct device *dev); | ||
142 | 138 | ||
143 | 139 | ||
144 | #ifdef CONFIG_PCMCIA_DEBUG | 140 | #ifdef CONFIG_PCMCIA_DEBUG |