diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-26 01:32:37 +0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-26 01:38:09 +0400 |
commit | b60a5ede1e3a6a09a881c3ff014164fbe4d481b4 (patch) | |
tree | b29e5890aa39ab7bc25ec2d6f1b5a0948c948ae5 /drivers/pcmcia/ds_internal.h | |
parent | dc953e550bf1624a17465b9deb15487fdde98869 (diff) | |
download | linux-b60a5ede1e3a6a09a881c3ff014164fbe4d481b4.tar.xz |
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 @@ -/* ds_internal.h - internal header for 16-bit PCMCIA devices management */ - -extern spinlock_t pcmcia_dev_list_lock; -extern struct bus_type pcmcia_bus_type; - -extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev); -extern void pcmcia_put_dev(struct pcmcia_device *p_dev); - -struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function); - -extern int pcmcia_release_configuration(struct pcmcia_device *p_dev); - -#ifdef CONFIG_PCMCIA_IOCTL -extern void __init pcmcia_setup_ioctl(void); -extern void __exit pcmcia_cleanup_ioctl(void); -extern void handle_event(struct pcmcia_socket *s, event_t event); -extern int handle_request(struct pcmcia_socket *s, event_t event); -#else -static inline void __init pcmcia_setup_ioctl(void) { return; } -static inline void __exit pcmcia_cleanup_ioctl(void) { return; } -static inline void handle_event(struct pcmcia_socket *s, event_t event) -{ - return; -} -static inline int handle_request(struct pcmcia_socket *s, event_t event) -{ - return 0; -} -#endif |