---

yaml --- r: 114159 b: refs/heads/master c: a45b3fb h: refs/heads/master i: 114157: dfd539d 114155: 779b9f1 114151: 0e73296 114143: ed6d66d v: v3
git-mirror · Aug 31, 2008 · 9373f1b · 9373f1b
1 parent 0c209f9
commit 9373f1b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;