Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6

[linux-2.6-block.git] / include / pcmcia / ss.h

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 9b4ac9385f5d094a07dcaae9daad1c04b6bfb2bd..9a3b4986517324cf50d98db5cfdb169b32ff3711 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -90,14 +90,14 @@ typedef struct pccard_io_map {
        u_char  map;
        u_char  flags;
        u_short speed;
-       u_int   start, stop;
+       phys_addr_t start, stop;
 } pccard_io_map;
 
 typedef struct pccard_mem_map {
        u_char          map;
        u_char          flags;
        u_short         speed;
-       u_long          static_start;
+       phys_addr_t     static_start;
        u_int           card_start;
        struct resource *res;
 } pccard_mem_map;