aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/serial_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r--drivers/serial/serial_cs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index d8b660061c13..164d2a42eb59 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -389,7 +389,7 @@ static void serial_detach(struct pcmcia_device *link)
389/*====================================================================*/ 389/*====================================================================*/
390 390
391static int setup_serial(struct pcmcia_device *handle, struct serial_info * info, 391static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
392 kio_addr_t iobase, int irq) 392 unsigned int iobase, int irq)
393{ 393{
394 struct uart_port port; 394 struct uart_port port;
395 int line; 395 int line;
@@ -456,7 +456,7 @@ next_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse)
456 456
457static int simple_config(struct pcmcia_device *link) 457static int simple_config(struct pcmcia_device *link)
458{ 458{
459 static const kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; 459 static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
460 static const int size_table[2] = { 8, 16 }; 460 static const int size_table[2] = { 8, 16 };
461 struct serial_info *info = link->priv; 461 struct serial_info *info = link->priv;
462 struct serial_cfg_mem *cfg_mem; 462 struct serial_cfg_mem *cfg_mem;
@@ -480,7 +480,7 @@ static int simple_config(struct pcmcia_device *link)
480 /* If the card is already configured, look up the port and irq */ 480 /* If the card is already configured, look up the port and irq */
481 i = pcmcia_get_configuration_info(link, &config); 481 i = pcmcia_get_configuration_info(link, &config);
482 if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) { 482 if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
483 kio_addr_t port = 0; 483 unsigned int port = 0;
484 if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) { 484 if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
485 port = config.BasePort2; 485 port = config.BasePort2;
486 info->slave = 1; 486 info->slave = 1;