linux-mips
[Top] [All Lists]

PATCH

To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
Subject: PATCH
From: Pete Popov <ppopov@embeddedalley.com>
Date: 10 Oct 2004 10:17:39 -0700
Organization:
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Ralf, or anyone else, any suggestions on how to get a patch like the one
below accepted in 2.6? It's needed due to the 36 bit address of the
pcmcia controller on the Au1x CPUs.

diff -Naur --exclude=CVS linux-2.6-orig/include/pcmcia/cs_types.h 
linux-2.6-dev/include/pcmcia/cs_types.h
--- linux-2.6-orig/include/pcmcia/cs_types.h    2004-02-24 18:09:31.000000000 
-0800
+++ linux-2.6-dev/include/pcmcia/cs_types.h     2004-09-25 19:57:11.000000000 
-0700
@@ -36,8 +36,10 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__arm__) || defined(__mips__)
-typedef u_int   ioaddr_t;
+#if defined(__arm__)
+typedef u_int ioaddr_t;
+#elif defined(__mips__)
+typedef phys_t ioaddr_t;
 #else
 typedef u_short        ioaddr_t;
 #endif
diff -Naur --exclude=CVS linux-2.6-orig/include/pcmcia/ss.h 
linux-2.6-dev/include/pcmcia/ss.h
--- linux-2.6-orig/include/pcmcia/ss.h  2004-09-22 23:20:17.000000000 -0700
+++ linux-2.6-dev/include/pcmcia/ss.h   2004-09-25 19:57:47.000000000 -0700
@@ -103,7 +103,7 @@
     u_char     map;
     u_char     flags;
     u_short    speed;
-    u_long     static_start;
+    ioaddr_t   static_start;
     u_int      card_start;
     struct resource *res;
 } pccard_mem_map;




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