aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/m32r_cfc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/m32r_cfc.c')
-rw-r--r--drivers/pcmcia/m32r_cfc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index 91da15b5a81e..3616da227152 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -58,7 +58,7 @@ typedef struct pcc_socket {
58 u_short type, flags; 58 u_short type, flags;
59 struct pcmcia_socket socket; 59 struct pcmcia_socket socket;
60 unsigned int number; 60 unsigned int number;
61 kio_addr_t ioaddr; 61 unsigned int ioaddr;
62 u_long mapaddr; 62 u_long mapaddr;
63 u_long base; /* PCC register base */ 63 u_long base; /* PCC register base */
64 u_char cs_irq1, cs_irq2, intr; 64 u_char cs_irq1, cs_irq2, intr;
@@ -298,7 +298,8 @@ static int __init is_alive(u_short sock)
298 return 0; 298 return 0;
299} 299}
300 300
301static void add_pcc_socket(ulong base, int irq, ulong mapaddr, kio_addr_t ioaddr) 301static void add_pcc_socket(ulong base, int irq, ulong mapaddr,
302 unsigned int ioaddr)
302{ 303{
303 pcc_socket_t *t = &socket[pcc_sockets]; 304 pcc_socket_t *t = &socket[pcc_sockets];
304 305
@@ -738,7 +739,7 @@ static int __init init_m32r_pcc(void)
738#else /* CONFIG_PLAT_USRV */ 739#else /* CONFIG_PLAT_USRV */
739 { 740 {
740 ulong base, mapaddr; 741 ulong base, mapaddr;
741 kio_addr_t ioaddr; 742 unsigned int ioaddr;
742 743
743 for (i = 0 ; i < M32R_MAX_PCC ; i++) { 744 for (i = 0 ; i < M32R_MAX_PCC ; i++) {
744 base = (ulong)PLD_CFRSTCR; 745 base = (ulong)PLD_CFRSTCR;