aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 16:00:42 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 16:00:42 +0200
commita45b3fb19ba1e4dfc3fc53563a072612092930a9 (patch)
treeb973d46c7f9002d403bbd09d959b029fb9144351 /include/pcmcia
parent272433e088f843dc4dd5a5ad38dd68b9a93dcebf (diff)
downloadmrst-s0i3-test-a45b3fb19ba1e4dfc3fc53563a072612092930a9.tar.gz
mrst-s0i3-test-a45b3fb19ba1e4dfc3fc53563a072612092930a9.tar.xz
mrst-s0i3-test-a45b3fb19ba1e4dfc3fc53563a072612092930a9.zip
pcmcia: ioctl-internal definitions
cisinfo_t and cs_status_t are only used by the (deprecated) PCMCIA ioctl. Therefore, move them out of the way. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/cistpl.h5
-rw-r--r--include/pcmcia/cs.h6
-rw-r--r--include/pcmcia/ds.h11
3 files changed, 11 insertions, 11 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index 026323bc47a..cfdd5af77dc 100644
--- a/include/pcmcia/cistpl.h
+++ b/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/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 6944a74d3a7..904468a191e 100644
--- a/include/pcmcia/cs.h
+++ b/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/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 5fb61952bce..a2be80b9a09 100644
--- a/include/pcmcia/ds.h
+++ b/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;