diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:19:42 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:19:42 -0200 |
| commit | 01d687a75155f9c9181e46572a60c71040d9133d (patch) | |
| tree | 23a5939cfc6b1f24d0730c5c70a3d43c96063d6e /linux/drivers/media/video/ivtv/ivtv-driver.h | |
| parent | 806e8a78b6b2b8bbab30dafd89ada8402e9564ed (diff) | |
| parent | 13f01356dce8354c14e7e1a3f25162a24a002fff (diff) | |
| download | mediapointer-dvb-s2-01d687a75155f9c9181e46572a60c71040d9133d.tar.gz mediapointer-dvb-s2-01d687a75155f9c9181e46572a60c71040d9133d.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.h')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index cb87caa63..39e1d7e46 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -509,6 +509,7 @@ struct ivtv_stream { struct ivtv_open_id { u32 open_id; int type; + enum v4l2_priority prio; struct ivtv *itv; }; @@ -612,7 +613,6 @@ struct yuv_playback_info int lace_mode; int lace_threshold; - int lace_threshold_last; int lace_sync_field; atomic_t next_dma_frame; @@ -739,6 +739,7 @@ struct ivtv { u32 base_addr; u32 irqmask; + struct v4l2_prio_state prio; struct workqueue_struct *irq_work_queues; struct work_struct irq_work_queue; struct timer_list dma_timer; /* Timer used to catch unfinished DMAs */ |