diff options
Diffstat (limited to 'drivers/pcmcia/rsrc_nonstatic.c')
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index bfcaad6021cf..a8d100707721 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -186,15 +186,16 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num) | |||
186 | ======================================================================*/ | 186 | ======================================================================*/ |
187 | 187 | ||
188 | #ifdef CONFIG_PCMCIA_PROBE | 188 | #ifdef CONFIG_PCMCIA_PROBE |
189 | static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num) | 189 | static void do_io_probe(struct pcmcia_socket *s, unsigned int base, |
190 | unsigned int num) | ||
190 | { | 191 | { |
191 | struct resource *res; | 192 | struct resource *res; |
192 | struct socket_data *s_data = s->resource_data; | 193 | struct socket_data *s_data = s->resource_data; |
193 | kio_addr_t i, j, bad; | 194 | unsigned int i, j, bad; |
194 | int any; | 195 | int any; |
195 | u_char *b, hole, most; | 196 | u_char *b, hole, most; |
196 | 197 | ||
197 | printk(KERN_INFO "cs: IO port probe %#lx-%#lx:", | 198 | printk(KERN_INFO "cs: IO port probe %#x-%#x:", |
198 | base, base+num-1); | 199 | base, base+num-1); |
199 | 200 | ||
200 | /* First, what does a floating port look like? */ | 201 | /* First, what does a floating port look like? */ |
@@ -233,7 +234,7 @@ static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num | |||
233 | } else { | 234 | } else { |
234 | if (bad) { | 235 | if (bad) { |
235 | sub_interval(&s_data->io_db, bad, i-bad); | 236 | sub_interval(&s_data->io_db, bad, i-bad); |
236 | printk(" %#lx-%#lx", bad, i-1); | 237 | printk(" %#x-%#x", bad, i-1); |
237 | bad = 0; | 238 | bad = 0; |
238 | } | 239 | } |
239 | } | 240 | } |
@@ -244,7 +245,7 @@ static void do_io_probe(struct pcmcia_socket *s, kio_addr_t base, kio_addr_t num | |||
244 | return; | 245 | return; |
245 | } else { | 246 | } else { |
246 | sub_interval(&s_data->io_db, bad, i-bad); | 247 | sub_interval(&s_data->io_db, bad, i-bad); |
247 | printk(" %#lx-%#lx", bad, i-1); | 248 | printk(" %#x-%#x", bad, i-1); |
248 | } | 249 | } |
249 | } | 250 | } |
250 | 251 | ||