X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fpcmcia%2Fss.h;h=7883d79b9055076c945d6a23fe39af6a549a5351;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=4df622f6da478a97d324786b982783f3be42d905;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 4df622f6d..7883d79b9 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -103,7 +103,7 @@ 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;
@@ -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 */