diff options
Diffstat (limited to 'include/pcmcia/ss.h')
| -rw-r--r-- | include/pcmcia/ss.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 0f7aacc33fe9..e788bbc5657d 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
| @@ -17,10 +17,14 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/config.h> | 18 | #include <linux/config.h> |
| 19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 20 | #include <linux/sched.h> /* task_struct, completion */ | ||
| 20 | 21 | ||
| 21 | #include <pcmcia/cs_types.h> | 22 | #include <pcmcia/cs_types.h> |
| 22 | #include <pcmcia/cs.h> | 23 | #include <pcmcia/cs.h> |
| 23 | #include <pcmcia/bulkmem.h> | 24 | #include <pcmcia/bulkmem.h> |
| 25 | #ifdef CONFIG_CARDBUS | ||
| 26 | #include <linux/pci.h> | ||
| 27 | #endif | ||
| 24 | 28 | ||
| 25 | /* Definitions for card status flags for GetStatus */ | 29 | /* Definitions for card status flags for GetStatus */ |
| 26 | #define SS_WRPROT 0x0001 | 30 | #define SS_WRPROT 0x0001 |
| @@ -233,7 +237,11 @@ struct pcmcia_socket { | |||
| 233 | 237 | ||
| 234 | /* so is power hook */ | 238 | /* so is power hook */ |
| 235 | int (*power_hook)(struct pcmcia_socket *sock, int operation); | 239 | int (*power_hook)(struct pcmcia_socket *sock, int operation); |
| 236 | 240 | #ifdef CONFIG_CARDBUS | |
| 241 | /* allows tuning the CB bridge before loading driver for the CB card */ | ||
| 242 | void (*tune_bridge)(struct pcmcia_socket *sock, struct pci_bus *bus); | ||
| 243 | #endif | ||
| 244 | |||
| 237 | /* state thread */ | 245 | /* state thread */ |
| 238 | struct semaphore skt_sem; /* protects socket h/w state */ | 246 | struct semaphore skt_sem; /* protects socket h/w state */ |
| 239 | 247 | ||
