diff --git a/[refs] b/[refs]
index 0d9152fca93f..5970868cafe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 272433e088f843dc4dd5a5ad38dd68b9a93dcebf
+refs/heads/master: a45b3fb19ba1e4dfc3fc53563a072612092930a9
diff --git a/trunk/include/pcmcia/cistpl.h b/trunk/include/pcmcia/cistpl.h
index 026323bc47af..cfdd5af77dcc 100644
--- a/trunk/include/pcmcia/cistpl.h
+++ b/trunk/include/pcmcia/cistpl.h
@@ -573,11 +573,6 @@ typedef struct tuple_t {
 #define TUPLE_RETURN_LINK	0x01
 #define TUPLE_RETURN_COMMON	0x02
 
-/* For ValidateCIS */
-typedef struct cisinfo_t {
-    u_int	Chains;
-} cisinfo_t;
-
 #define CISTPL_MAX_CIS_SIZE	0x200
 
 #endif /* LINUX_CISTPL_H */
diff --git a/trunk/include/pcmcia/cs.h b/trunk/include/pcmcia/cs.h
index 6944a74d3a7c..904468a191ef 100644
--- a/trunk/include/pcmcia/cs.h
+++ b/trunk/include/pcmcia/cs.h
@@ -201,12 +201,6 @@ typedef struct win_req_t {
 #define WIN_BAR_MASK		0xe000
 #define WIN_BAR_SHIFT		13
 
-typedef struct cs_status_t {
-    u_char	Function;
-    event_t 	CardState;
-    event_t	SocketState;
-} cs_status_t;
-
 typedef struct error_info_t {
     int		func;
     int		retcode;
diff --git a/trunk/include/pcmcia/ds.h b/trunk/include/pcmcia/ds.h
index 5fb61952bce8..a2be80b9a095 100644
--- a/trunk/include/pcmcia/ds.h
+++ b/trunk/include/pcmcia/ds.h
@@ -367,6 +367,17 @@ typedef struct config_info_t {
 	u_int			IOAddrLines;
 } config_info_t;
 
+/* For ValidateCIS */
+typedef struct cisinfo_t {
+	u_int			Chains;
+} cisinfo_t;
+
+typedef struct cs_status_t {
+	u_char			Function;
+	event_t 		CardState;
+	event_t			SocketState;
+} cs_status_t;
+
 typedef union ds_ioctl_arg_t {
 	adjust_t		adjust;
 	config_info_t		config;