diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-ioctl.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 584ffc61c982..e1a31830e9f6 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -128,37 +128,6 @@ u16 ivtv_get_service_set(struct v4l2_sliced_vbi_format *fmt) | |||
128 | return set; | 128 | return set; |
129 | } | 129 | } |
130 | 130 | ||
131 | static const struct { | ||
132 | v4l2_std_id std; | ||
133 | char *name; | ||
134 | } enum_stds[] = { | ||
135 | { V4L2_STD_PAL_BG | V4L2_STD_PAL_H, "PAL-BGH" }, | ||
136 | { V4L2_STD_PAL_DK, "PAL-DK" }, | ||
137 | { V4L2_STD_PAL_I, "PAL-I" }, | ||
138 | { V4L2_STD_PAL_M, "PAL-M" }, | ||
139 | { V4L2_STD_PAL_N, "PAL-N" }, | ||
140 | { V4L2_STD_PAL_Nc, "PAL-Nc" }, | ||
141 | { V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H, "SECAM-BGH" }, | ||
142 | { V4L2_STD_SECAM_DK, "SECAM-DK" }, | ||
143 | { V4L2_STD_SECAM_L, "SECAM-L" }, | ||
144 | { V4L2_STD_SECAM_LC, "SECAM-L'" }, | ||
145 | { V4L2_STD_NTSC_M, "NTSC-M" }, | ||
146 | { V4L2_STD_NTSC_M_JP, "NTSC-J" }, | ||
147 | { V4L2_STD_NTSC_M_KR, "NTSC-K" }, | ||
148 | }; | ||
149 | |||
150 | static const struct v4l2_standard ivtv_std_60hz = | ||
151 | { | ||
152 | .frameperiod = {.numerator = 1001, .denominator = 30000}, | ||
153 | .framelines = 525, | ||
154 | }; | ||
155 | |||
156 | static const struct v4l2_standard ivtv_std_50hz = | ||
157 | { | ||
158 | .frameperiod = {.numerator = 1, .denominator = 25}, | ||
159 | .framelines = 625, | ||
160 | }; | ||
161 | |||
162 | void ivtv_set_osd_alpha(struct ivtv *itv) | 131 | void ivtv_set_osd_alpha(struct ivtv *itv) |
163 | { | 132 | { |
164 | ivtv_vapi(itv, CX2341X_OSD_SET_GLOBAL_ALPHA, 3, | 133 | ivtv_vapi(itv, CX2341X_OSD_SET_GLOBAL_ALPHA, 3, |