diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-03-24 15:33:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 12:16:54 -0400 |
commit | 52faaf78b5059fcc927f3b821e6aa92cf50d3143 (patch) | |
tree | 158c1c18a21f493e0a2e7d9da6045bf647fb7d70 /drivers/media/usb/em28xx/em28xx.h | |
parent | 9297285e51c0f0305b660d6330a7916da18451c8 (diff) |
[media] em28xx: move TV norm from struct em28xx to struct v4l2
TV norm is specific to analog TV reception. move it out of the common
em28xx struct.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index ccb9cd5f8947..5cf423449896 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h | |||
@@ -519,6 +519,8 @@ struct em28xx_v4l2 { | |||
519 | u8 vinmode; | 519 | u8 vinmode; |
520 | u8 vinctl; | 520 | u8 vinctl; |
521 | 521 | ||
522 | v4l2_std_id norm; /* selected tv norm */ | ||
523 | |||
522 | /* Frame properties */ | 524 | /* Frame properties */ |
523 | int width; /* current frame width */ | 525 | int width; /* current frame width */ |
524 | int height; /* current frame height */ | 526 | int height; /* current frame height */ |
@@ -633,7 +635,6 @@ struct em28xx { | |||
633 | /* video for linux */ | 635 | /* video for linux */ |
634 | int users; /* user count for exclusive use */ | 636 | int users; /* user count for exclusive use */ |
635 | int streaming_users; /* Number of actively streaming users */ | 637 | int streaming_users; /* Number of actively streaming users */ |
636 | v4l2_std_id norm; /* selected tv norm */ | ||
637 | int ctl_freq; /* selected frequency */ | 638 | int ctl_freq; /* selected frequency */ |
638 | unsigned int ctl_input; /* selected input */ | 639 | unsigned int ctl_input; /* selected input */ |
639 | unsigned int ctl_ainput;/* selected audio input */ | 640 | unsigned int ctl_ainput;/* selected audio input */ |