From 4b20132c48b7ab614982a72968e0a9dba5d6e421 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Sat, 19 Feb 2011 12:35:15 +0100 Subject: [PATCH] --- yaml --- r: 233559 b: refs/heads/master c: 33619f0d3ff715a2a5499520967d526ad931d70d h: refs/heads/master i: 233557: 5810775b47e2152e98623aa270fec771576eb88b 233555: c726c1a227a37a901f4d00558f87788febf60702 233551: 3c3441ad4ca1f1c0d3af979b1a97d25925bda5af v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pcmcia_resource.c | 2 ++ trunk/include/pcmcia/ds.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fcbbb5da1788..148a6fc71b17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 644e6e4a7fa6b11d59f24032997d90ea0d858d03 +refs/heads/master: 33619f0d3ff715a2a5499520967d526ad931d70d diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c index 0bdda5b3ed55..42fbf1a75576 100644 --- a/trunk/drivers/pcmcia/pcmcia_resource.c +++ b/trunk/drivers/pcmcia/pcmcia_resource.c @@ -518,6 +518,8 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev) flags |= CONF_ENABLE_IOCARD; if (flags & CONF_ENABLE_IOCARD) s->socket.flags |= SS_IOCARD; + if (flags & CONF_ENABLE_ZVCARD) + s->socket.flags |= SS_ZVCARD | SS_IOCARD; if (flags & CONF_ENABLE_SPKR) { s->socket.flags |= SS_SPKR_ENA; status = CCSR_AUDIO_ENA; diff --git a/trunk/include/pcmcia/ds.h b/trunk/include/pcmcia/ds.h index 8479b66c067b..3fd5064dd43a 100644 --- a/trunk/include/pcmcia/ds.h +++ b/trunk/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? */