summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2011-02-19 12:35:15 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2011-02-20 12:47:34 +0100
commit33619f0d3ff715a2a5499520967d526ad931d70d (patch)
tree6956d30f906eac49454bc7b241e2ba202b9bfa9f /drivers/pcmcia
parent644e6e4a7fa6b11d59f24032997d90ea0d858d03 (diff)
downloadop-kernel-dev-33619f0d3ff715a2a5499520967d526ad931d70d.zip
op-kernel-dev-33619f0d3ff715a2a5499520967d526ad931d70d.tar.gz
pcmcia: re-enable Zoomed Video support
Allow drivers to enable Zoomed Video support. Currently, this is only used by out-of-tree drivers (L64020 DVB driver in particular). CC: <stable@kernel.org> [for 2.6.37] Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 0bdda5b3..42fbf1a 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/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;
OpenPOWER on IntegriCloud