diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-24 19:03:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-24 19:03:11 -0300 |
| commit | eea2301e210243d3bedcd2441624c6082cc73789 (patch) | |
| tree | f69b360261b285df698770984bc37cd93d2e6fe3 /linux/drivers/media | |
| parent | 5f465767892947f740d56fe91e8185afd4545602 (diff) | |
| parent | 1e3e732c5181071f4476684045f2149a6d1c73b3 (diff) | |
| download | mediapointer-dvb-s2-eea2301e210243d3bedcd2441624c6082cc73789.tar.gz mediapointer-dvb-s2-eea2301e210243d3bedcd2441624c6082cc73789.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/saa7134
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -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; |