Commit 33619f0d3ff715a2a5499520967d526ad931d70d
1 parent
644e6e4a7f
Exists in
master
and in
4 other branches
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>
Showing 2 changed files with 3 additions and 0 deletions Side-by-side Diff
drivers/pcmcia/pcmcia_resource.c
| ... | ... | @@ -518,6 +518,8 @@ |
| 518 | 518 | flags |= CONF_ENABLE_IOCARD; |
| 519 | 519 | if (flags & CONF_ENABLE_IOCARD) |
| 520 | 520 | s->socket.flags |= SS_IOCARD; |
| 521 | + if (flags & CONF_ENABLE_ZVCARD) | |
| 522 | + s->socket.flags |= SS_ZVCARD | SS_IOCARD; | |
| 521 | 523 | if (flags & CONF_ENABLE_SPKR) { |
| 522 | 524 | s->socket.flags |= SS_SPKR_ENA; |
| 523 | 525 | status = CCSR_AUDIO_ENA; |
include/pcmcia/ds.h
| ... | ... | @@ -261,6 +261,7 @@ |
| 261 | 261 | #define CONF_ENABLE_ESR 0x0008 |
| 262 | 262 | #define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ |
| 263 | 263 | * (CONF_ENABLE_IRQ) in use */ |
| 264 | +#define CONF_ENABLE_ZVCARD 0x0020 | |
| 264 | 265 | |
| 265 | 266 | /* flags used by pcmcia_loop_config() autoconfiguration */ |
| 266 | 267 | #define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */ |