summaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ss.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-06-27 16:28:46 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 18:03:18 -0700
commit3c29976a6469b81a7858812dc2d4b8430d74004a (patch)
tree2a8baf9ad5ffe36b55fd5c0b9f8fcf0e2c67e2f6 /include/pcmcia/ss.h
parent22916638b124e859b595099bd0c86a1e09e767fb (diff)
downloadkernel-crypto-3c29976a6469b81a7858812dc2d4b8430d74004a.tar.gz
kernel-crypto-3c29976a6469b81a7858812dc2d4b8430d74004a.tar.xz
kernel-crypto-3c29976a6469b81a7858812dc2d4b8430d74004a.zip
[PATCH] pcmcia: mark parent bridge windows as resources available for PCMCIA devices
Automatically mark the parent PCI-PCI bridge windows as resources available for PCMCIA usage. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/pcmcia/ss.h')
-rw-r--r--include/pcmcia/ss.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 67b867f31fe..f8797767051 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -216,8 +216,9 @@ struct pcmcia_socket {
/* is set to one if resource setup is done using adjust_resource_info() */
u8 resource_setup_old:1;
+ u8 resource_setup_new:1;
- u8 reserved:6;
+ u8 reserved:5;
/* socket operations */
struct pccard_operations * ops;