diff options
Diffstat (limited to 'include/pcmcia')
-rw-r--r-- | include/pcmcia/ds.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 557d8aea1a86..93a7ebc34156 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -108,8 +108,6 @@ typedef struct dev_node_t { | |||
108 | #define DEV_CONFIG 0x02 | 108 | #define DEV_CONFIG 0x02 |
109 | #define DEV_SUSPEND_NORELEASE 0x04 | 109 | #define DEV_SUSPEND_NORELEASE 0x04 |
110 | #define DEV_CONFIG_PENDING 0x10 | 110 | #define DEV_CONFIG_PENDING 0x10 |
111 | #define DEV_RELEASE_PENDING 0x20 | ||
112 | #define DEV_SUSPEND 0x40 | ||
113 | #define DEV_BUSY 0x80 | 111 | #define DEV_BUSY 0x80 |
114 | 112 | ||
115 | #define DEV_OK(l) \ | 113 | #define DEV_OK(l) \ |
@@ -163,13 +161,15 @@ struct pcmcia_device { | |||
163 | 161 | ||
164 | u_int p_state; | 162 | u_int p_state; |
165 | 163 | ||
164 | u8 suspended:1; | ||
165 | u8 reserved:3; | ||
166 | |||
166 | /* information about this device */ | 167 | /* information about this device */ |
167 | u8 has_manf_id:1; | 168 | u8 has_manf_id:1; |
168 | u8 has_card_id:1; | 169 | u8 has_card_id:1; |
169 | u8 has_func_id:1; | 170 | u8 has_func_id:1; |
170 | 171 | ||
171 | u8 allow_func_id_match:1; | 172 | u8 allow_func_id_match:1; |
172 | u8 reserved:4; | ||
173 | 173 | ||
174 | u8 func_id; | 174 | u8 func_id; |
175 | u16 manf_id; | 175 | u16 manf_id; |