diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:32:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-25 14:32:18 -0300 |
| commit | 91cb86194d6146eb1da0f838116b5bc752a0c62d (patch) | |
| tree | f9059fb0da363883dbc759d7b68ea1ed5616723a /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | dac7e782978c3029d3fa21243295837f262ccac8 (diff) | |
| parent | a325b0a427757946052053834c1dbbc50f89526c (diff) | |
| download | mediapointer-dvb-s2-91cb86194d6146eb1da0f838116b5bc752a0c62d.tar.gz mediapointer-dvb-s2-91cb86194d6146eb1da0f838116b5bc752a0c62d.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 2ea755b8c..991b30493 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -395,9 +395,7 @@ struct saa7134_fh { unsigned int radio; enum v4l2_buf_type type; unsigned int resources; -#ifdef VIDIOC_G_PRIORITY enum v4l2_priority prio; -#endif /* video overlay */ struct v4l2_window win; @@ -483,9 +481,7 @@ struct saa7134_dev { struct semaphore lock; #endif spinlock_t slock; -#ifdef VIDIOC_G_PRIORITY struct v4l2_prio_state prio; -#endif /* workstruct for loading modules */ struct work_struct request_module_wk; |