diff options
author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /include/pcmcia/ss.h | |
parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r-- | include/pcmcia/ss.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 2e488b60bc76..344705cb42f4 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -224,18 +224,16 @@ struct pcmcia_socket { | |||
224 | 224 | ||
225 | /* 16-bit state: */ | 225 | /* 16-bit state: */ |
226 | struct { | 226 | struct { |
227 | /* PCMCIA card is present in socket */ | ||
228 | u8 present:1; | ||
229 | /* "master" ioctl is used */ | 227 | /* "master" ioctl is used */ |
230 | u8 busy:1; | 228 | u8 busy:1; |
231 | /* pcmcia module is being unloaded */ | ||
232 | u8 dead:1; | ||
233 | /* the PCMCIA card consists of two pseudo devices */ | 229 | /* the PCMCIA card consists of two pseudo devices */ |
234 | u8 has_pfc:1; | 230 | u8 has_pfc:1; |
235 | 231 | ||
236 | u8 reserved:4; | 232 | u8 reserved:6; |
237 | } pcmcia_state; | 233 | } pcmcia_state; |
238 | 234 | ||
235 | /* non-zero if PCMCIA card is present */ | ||
236 | atomic_t present; | ||
239 | 237 | ||
240 | #ifdef CONFIG_PCMCIA_IOCTL | 238 | #ifdef CONFIG_PCMCIA_IOCTL |
241 | struct user_info_t *user; | 239 | struct user_info_t *user; |