Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[~andy/linux] / include / pcmcia / ds.h

diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 5fb61952bce82515623fb654533150b5382dac51..a2be80b9a095fcd1bb955af8d2eacd75eafdddec 100644 (file)
--- 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;