linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ppopov@linux-mips.org
Date: Sun, 02 Jan 2005 10:07:40 +0000
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/01/02 10:07:34

Modified files:
        drivers/pcmcia : au1000_generic.c 

Log message:
        Fixed an ioremap bug: Au1x pcmcia I/O is a 36 bit address.

diff -urN linux/drivers/pcmcia/au1000_generic.c 
linux/drivers/pcmcia/au1000_generic.c
--- linux/drivers/pcmcia/au1000_generic.c       2004/10/11 20:01:14     1.16
+++ linux/drivers/pcmcia/au1000_generic.c       2005/01/02 10:07:33     1.17
@@ -422,7 +422,7 @@
                 */
                if (i == 0) {
                        skt->virt_io = (void *)
-                               ((u32)ioremap((ioaddr_t)AU1X_SOCK0_IO, 0x1000) -
+                               (ioremap((phys_t)AU1X_SOCK0_IO, 0x1000) -
                                (u32)mips_io_port_base);
                        skt->phys_attr = AU1X_SOCK0_PSEUDO_PHYS_ATTR;
                        skt->phys_mem = AU1X_SOCK0_PSEUDO_PHYS_MEM;
@@ -430,7 +430,7 @@
 #ifndef CONFIG_MIPS_XXS1500
                else  {
                        skt->virt_io = (void *)
-                               ((u32)ioremap((ioaddr_t)AU1X_SOCK1_IO, 0x1000) -
+                               (ioremap((phys_t)AU1X_SOCK1_IO, 0x1000) -
                                (u32)mips_io_port_base);
                        skt->phys_attr = AU1X_SOCK1_PSEUDO_PHYS_ATTR;
                        skt->phys_mem = AU1X_SOCK1_PSEUDO_PHYS_MEM;

<Prev in Thread] Current Thread [Next in Thread>