aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/zoran.h')
-rw-r--r--drivers/media/video/zoran.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 0166f555a5ca..ffcda95ed9d4 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -159,7 +159,7 @@ Private IOCTL to set up for displaying MJPEG
159#define BUZ_MAX_FRAME 256 /* Must be a power of 2 */ 159#define BUZ_MAX_FRAME 256 /* Must be a power of 2 */
160#define BUZ_MASK_FRAME 255 /* Must be BUZ_MAX_FRAME-1 */ 160#define BUZ_MASK_FRAME 255 /* Must be BUZ_MAX_FRAME-1 */
161 161
162#define BUZ_MAX_INPUT 8 162#define BUZ_MAX_INPUT 16
163 163
164#if VIDEO_MAX_FRAME <= 32 164#if VIDEO_MAX_FRAME <= 32
165# define V4L_MAX_FRAME 32 165# define V4L_MAX_FRAME 32
@@ -191,6 +191,9 @@ enum card_type {
191 /* Iomega */ 191 /* Iomega */
192 BUZ, 192 BUZ,
193 193
194 /* AverMedia */
195 AVS6EYES,
196
194 /* total number of cards */ 197 /* total number of cards */
195 NUM_CARDS 198 NUM_CARDS
196}; 199};
@@ -379,6 +382,9 @@ struct card_info {
379 /* is the /GWS line conected? */ 382 /* is the /GWS line conected? */
380 u8 gws_not_connected; 383 u8 gws_not_connected;
381 384
385 /* avs6eyes mux setting */
386 u8 input_mux;
387
382 void (*init) (struct zoran * zr); 388 void (*init) (struct zoran * zr);
383}; 389};
384 390