diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-07 04:52:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 21:51:28 -0500 |
commit | 69a61642ac60e84647394b4cf0f322579701d218 (patch) | |
tree | 2212c4d99d9ccd1f103c0d57dfa7e881ac274c83 /drivers/media/usb/em28xx/em28xx.h | |
parent | 081b945ed74c9bd37da2ee928f9ad281222a6477 (diff) |
[media] em28xx: convert to v4l2_fh, fix priority handling
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 707319eabe2d..7432be483c22 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <media/videobuf-vmalloc.h> | 34 | #include <media/videobuf-vmalloc.h> |
35 | #include <media/v4l2-device.h> | 35 | #include <media/v4l2-device.h> |
36 | #include <media/v4l2-ctrls.h> | 36 | #include <media/v4l2-ctrls.h> |
37 | #include <media/v4l2-fh.h> | ||
37 | #include <media/ir-kbd-i2c.h> | 38 | #include <media/ir-kbd-i2c.h> |
38 | #include <media/rc-core.h> | 39 | #include <media/rc-core.h> |
39 | #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE) | 40 | #if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE) |
@@ -477,6 +478,7 @@ struct em28xx_audio { | |||
477 | struct em28xx; | 478 | struct em28xx; |
478 | 479 | ||
479 | struct em28xx_fh { | 480 | struct em28xx_fh { |
481 | struct v4l2_fh fh; | ||
480 | struct em28xx *dev; | 482 | struct em28xx *dev; |
481 | int radio; | 483 | int radio; |
482 | unsigned int resources; | 484 | unsigned int resources; |