diff options
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
| -rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index b9269e66281a..fca10a1a56d0 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
| @@ -105,7 +105,7 @@ void pcmcia_validate_mem(struct pcmcia_socket *s) | |||
| 105 | } | 105 | } |
| 106 | EXPORT_SYMBOL(pcmcia_validate_mem); | 106 | EXPORT_SYMBOL(pcmcia_validate_mem); |
| 107 | 107 | ||
| 108 | int adjust_io_region(struct resource *res, unsigned long r_start, | 108 | int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, |
| 109 | unsigned long r_end, struct pcmcia_socket *s) | 109 | unsigned long r_end, struct pcmcia_socket *s) |
| 110 | { | 110 | { |
| 111 | if (s->resource_ops->adjust_io_region) | 111 | if (s->resource_ops->adjust_io_region) |
| @@ -113,7 +113,7 @@ int adjust_io_region(struct resource *res, unsigned long r_start, | |||
| 113 | return -ENOMEM; | 113 | return -ENOMEM; |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | struct resource *find_io_region(unsigned long base, int num, | 116 | struct resource *pcmcia_find_io_region(unsigned long base, int num, |
| 117 | unsigned long align, struct pcmcia_socket *s) | 117 | unsigned long align, struct pcmcia_socket *s) |
| 118 | { | 118 | { |
| 119 | if (s->resource_ops->find_io) | 119 | if (s->resource_ops->find_io) |
| @@ -121,7 +121,7 @@ struct resource *find_io_region(unsigned long base, int num, | |||
| 121 | return NULL; | 121 | return NULL; |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | struct resource *find_mem_region(u_long base, u_long num, u_long align, | 124 | struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, |
| 125 | int low, struct pcmcia_socket *s) | 125 | int low, struct pcmcia_socket *s) |
| 126 | { | 126 | { |
| 127 | if (s->resource_ops->find_mem) | 127 | if (s->resource_ops->find_mem) |