patch-2.3.36 linux/drivers/pcmcia/cs_internal.h

Next file: linux/drivers/pcmcia/i82365.c
Previous file: linux/drivers/pcmcia/cs.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.35/linux/drivers/pcmcia/cs_internal.h linux/drivers/pcmcia/cs_internal.h
@@ -136,8 +136,7 @@
     u_char			*cis_virt;
     config_t			*config;
 #ifdef CONFIG_CARDBUS
-    u_int			cb_cis_space;
-    cb_bridge_map		cb_cis_map;
+    struct resource *		cb_cis_res;
     u_char			*cb_cis_virt;
     struct cb_config_t		*cb_config;
 #endif
@@ -206,8 +205,7 @@
 void cb_disable(socket_info_t *s);
 void read_cb_mem(socket_info_t *s, u_char fn, int space,
 		 u_int addr, u_int len, void *ptr);
-int cb_setup_cis_mem(socket_info_t *s, int space);
-void cb_release_cis_mem(socket_info_t *s);
+void cb_release_cis_mem(socket_info_t * s);
 
 /* In cistpl.c */
 void read_cis_mem(socket_info_t *s, int attr,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)