diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-25 17:32:37 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-25 17:38:09 -0400 |
commit | b60a5ede1e3a6a09a881c3ff014164fbe4d481b4 (patch) | |
tree | b29e5890aa39ab7bc25ec2d6f1b5a0948c948ae5 /drivers/pcmcia/ds_internal.h | |
parent | dc953e550bf1624a17465b9deb15487fdde98869 (diff) |
pcmcia: merge ds_internal.h into cs_internal.h
Merge ds_internal.c into cs_internal.h.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/ds_internal.h')
-rw-r--r-- | drivers/pcmcia/ds_internal.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/pcmcia/ds_internal.h b/drivers/pcmcia/ds_internal.h deleted file mode 100644 index 14bc55aa1426..000000000000 --- a/drivers/pcmcia/ds_internal.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* ds_internal.h - internal header for 16-bit PCMCIA devices management */ | ||
2 | |||
3 | extern spinlock_t pcmcia_dev_list_lock; | ||
4 | extern struct bus_type pcmcia_bus_type; | ||
5 | |||
6 | extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev); | ||
7 | extern void pcmcia_put_dev(struct pcmcia_device *p_dev); | ||
8 | |||
9 | struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function); | ||
10 | |||
11 | extern int pcmcia_release_configuration(struct pcmcia_device *p_dev); | ||
12 | |||
13 | #ifdef CONFIG_PCMCIA_IOCTL | ||
14 | extern void __init pcmcia_setup_ioctl(void); | ||
15 | extern void __exit pcmcia_cleanup_ioctl(void); | ||
16 | extern void handle_event(struct pcmcia_socket *s, event_t event); | ||
17 | extern int handle_request(struct pcmcia_socket *s, event_t event); | ||
18 | #else | ||
19 | static inline void __init pcmcia_setup_ioctl(void) { return; } | ||
20 | static inline void __exit pcmcia_cleanup_ioctl(void) { return; } | ||
21 | static inline void handle_event(struct pcmcia_socket *s, event_t event) | ||
22 | { | ||
23 | return; | ||
24 | } | ||
25 | static inline int handle_request(struct pcmcia_socket *s, event_t event) | ||
26 | { | ||
27 | return 0; | ||
28 | } | ||
29 | #endif | ||