diff options
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r-- | drivers/pcmcia/ds.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 5c88ff8e7d7e..0de0f2300457 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -60,7 +60,7 @@ MODULE_DESCRIPTION("PCMCIA Driver Services"); | |||
60 | MODULE_LICENSE("GPL"); | 60 | MODULE_LICENSE("GPL"); |
61 | 61 | ||
62 | #ifdef DEBUG | 62 | #ifdef DEBUG |
63 | int ds_pc_debug; | 63 | static int ds_pc_debug; |
64 | 64 | ||
65 | module_param_named(pc_debug, ds_pc_debug, int, 0644); | 65 | module_param_named(pc_debug, ds_pc_debug, int, 0644); |
66 | 66 | ||
@@ -108,6 +108,8 @@ struct pcmcia_bus_socket { | |||
108 | }; | 108 | }; |
109 | static spinlock_t pcmcia_dev_list_lock; | 109 | static spinlock_t pcmcia_dev_list_lock; |
110 | 110 | ||
111 | static struct bus_type pcmcia_bus_type; | ||
112 | |||
111 | #define DS_SOCKET_PRESENT 0x01 | 113 | #define DS_SOCKET_PRESENT 0x01 |
112 | #define DS_SOCKET_BUSY 0x02 | 114 | #define DS_SOCKET_BUSY 0x02 |
113 | #define DS_SOCKET_REMOVAL_PENDING 0x10 | 115 | #define DS_SOCKET_REMOVAL_PENDING 0x10 |
@@ -218,7 +220,7 @@ static const lookup_t service_table[] = { | |||
218 | }; | 220 | }; |
219 | 221 | ||
220 | 222 | ||
221 | int pcmcia_report_error(client_handle_t handle, error_info_t *err) | 223 | static int pcmcia_report_error(client_handle_t handle, error_info_t *err) |
222 | { | 224 | { |
223 | int i; | 225 | int i; |
224 | char *serv; | 226 | char *serv; |
@@ -248,7 +250,6 @@ int pcmcia_report_error(client_handle_t handle, error_info_t *err) | |||
248 | 250 | ||
249 | return CS_SUCCESS; | 251 | return CS_SUCCESS; |
250 | } /* report_error */ | 252 | } /* report_error */ |
251 | EXPORT_SYMBOL(pcmcia_report_error); | ||
252 | 253 | ||
253 | /* end of code which was in cs.c before */ | 254 | /* end of code which was in cs.c before */ |
254 | 255 | ||
@@ -1901,13 +1902,12 @@ static struct class_interface pcmcia_bus_interface = { | |||
1901 | }; | 1902 | }; |
1902 | 1903 | ||
1903 | 1904 | ||
1904 | struct bus_type pcmcia_bus_type = { | 1905 | static struct bus_type pcmcia_bus_type = { |
1905 | .name = "pcmcia", | 1906 | .name = "pcmcia", |
1906 | .hotplug = pcmcia_bus_hotplug, | 1907 | .hotplug = pcmcia_bus_hotplug, |
1907 | .match = pcmcia_bus_match, | 1908 | .match = pcmcia_bus_match, |
1908 | .dev_attrs = pcmcia_dev_attrs, | 1909 | .dev_attrs = pcmcia_dev_attrs, |
1909 | }; | 1910 | }; |
1910 | EXPORT_SYMBOL(pcmcia_bus_type); | ||
1911 | 1911 | ||
1912 | 1912 | ||
1913 | static int __init init_pcmcia_bus(void) | 1913 | static int __init init_pcmcia_bus(void) |