summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-22 09:26:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-22 09:26:54 -0800
commitd8204a37baf5474d3154eb536c936369be2bd5c0 (patch)
treeeb598882870e1e21356a015a3634c5b68fc75e6a /include
parent571020df6fae18623498d70d3f2331d9eb7ad2be (diff)
parent33619f0d3ff715a2a5499520967d526ad931d70d (diff)
downloadlinux-d8204a37baf5474d3154eb536c936369be2bd5c0.tar.bz2
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: re-enable Zoomed Video support cm4000_cs: Fix undefined ops warning pcmcia vs. MECR on pxa25x/sa1111 drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/ds.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 8479b66c067b..3fd5064dd43a 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -261,6 +261,7 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev);
#define CONF_ENABLE_ESR 0x0008
#define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ
* (CONF_ENABLE_IRQ) in use */
+#define CONF_ENABLE_ZVCARD 0x0020
/* flags used by pcmcia_loop_config() autoconfiguration */
#define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */