diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-25 23:32:37 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-25 23:38:09 +0200 |
| commit | b60a5ede1e3a6a09a881c3ff014164fbe4d481b4 (patch) | |
| tree | b29e5890aa39ab7bc25ec2d6f1b5a0948c948ae5 /drivers/pcmcia/cs_internal.h | |
| parent | dc953e550bf1624a17465b9deb15487fdde98869 (diff) | |
| download | linux-stable-b60a5ede1e3a6a09a881c3ff014164fbe4d481b4.tar.gz | |
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/cs_internal.h')
| -rw-r--r-- | drivers/pcmcia/cs_internal.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 95297c57cdb1..8e43c4d563d1 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -177,4 +177,44 @@ struct resource *pcmcia_find_mem_region(u_long base, int low, struct pcmcia_socket *s); +/* + * Stuff internal to module "pcmcia". + */ +/* ds.c */ +extern struct bus_type pcmcia_bus_type; + +/* pcmcia_resource.c */ +extern int pcmcia_release_configuration(struct pcmcia_device *p_dev); + +#ifdef CONFIG_PCMCIA_IOCTL +/* ds.c */ +extern spinlock_t pcmcia_dev_list_lock; + +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); + +/* pcmcia_ioctl.c */ +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 /* CONFIG_PCMCIA_IOCTL */ + +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 /* CONFIG_PCMCIA_IOCTL */ + #endif /* _LINUX_CS_INTERNAL_H */ |