summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-03-13 13:50:15 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-03-13 13:50:15 -0300
commitdbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395 (patch)
tree8e9f703aba9ff7c66ddf4fef5a740a6ef44c71a4 /linux/drivers/media/video/ivtv/ivtv-driver.h
parentb4bd63c6ce993e0bf2bf3aaecc3384740b495845 (diff)
parenta73981e95b53d62cc7e42ce54e54473f3758d2e7 (diff)
downloadmediapointer-dvb-s2-dbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395.tar.gz
mediapointer-dvb-s2-dbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index cb87caa63..e84caa59b 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;
};
@@ -739,6 +740,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 */