vserver 1.9.3

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

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index aac024f..7883d79 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -103,8 +103,9 @@ typedef struct pccard_mem_map {
     u_char     map;
     u_char     flags;
     u_short    speed;
-    u_long     sys_start, sys_stop;
+    u_long     static_start;
     u_int      card_start;
+    struct resource *res;
 } pccard_mem_map;
 
 typedef struct cb_bridge_map {
@@ -145,6 +146,7 @@ typedef struct io_window_t {
        u_int                   Attributes;
        ioaddr_t                BasePort, NumPorts;
        ioaddr_t                InUse, Config;
+       struct resource         *res;
 } io_window_t;
 
 #define WINDOW_MAGIC   0xB35C
@@ -153,8 +155,6 @@ typedef struct window_t {
        u_short                 index;
        client_handle_t         handle;
        struct pcmcia_socket    *sock;
-       u_long                  base;
-       u_long                  size;
        pccard_mem_map          ctl;
 } window_t;
 
@@ -176,7 +176,7 @@ struct pcmcia_socket {
        u_short                         lock_count;
        client_handle_t                 clients;
        pccard_mem_map                  cis_mem;
-       u_char                          *cis_virt;
+       void __iomem                    *cis_virt;
        struct config_t                 *config;
        struct {
                u_int                   AssignedIRQ;
@@ -227,7 +227,7 @@ struct pcmcia_socket {
        /* cardbus (32-bit) */
 #ifdef CONFIG_CARDBUS
        struct resource *               cb_cis_res;
-       u_char                          *cb_cis_virt;
+       void __iomem                    *cb_cis_virt;
 #endif
 
        /* socket device */