Commit 33619f0d authored by Dominik Brodowski's avatar Dominik Brodowski

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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 644e6e4a
...@@ -518,6 +518,8 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev) ...@@ -518,6 +518,8 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev)
flags |= CONF_ENABLE_IOCARD; flags |= CONF_ENABLE_IOCARD;
if (flags & CONF_ENABLE_IOCARD) if (flags & CONF_ENABLE_IOCARD)
s->socket.flags |= SS_IOCARD; s->socket.flags |= SS_IOCARD;
if (flags & CONF_ENABLE_ZVCARD)
s->socket.flags |= SS_ZVCARD | SS_IOCARD;
if (flags & CONF_ENABLE_SPKR) { if (flags & CONF_ENABLE_SPKR) {
s->socket.flags |= SS_SPKR_ENA; s->socket.flags |= SS_SPKR_ENA;
status = CCSR_AUDIO_ENA; status = CCSR_AUDIO_ENA;
......
...@@ -261,6 +261,7 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev); ...@@ -261,6 +261,7 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev);
#define CONF_ENABLE_ESR 0x0008 #define CONF_ENABLE_ESR 0x0008
#define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ #define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ
* (CONF_ENABLE_IRQ) in use */ * (CONF_ENABLE_IRQ) in use */
#define CONF_ENABLE_ZVCARD 0x0020
/* flags used by pcmcia_loop_config() autoconfiguration */ /* flags used by pcmcia_loop_config() autoconfiguration */
#define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */ #define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment