diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-encoder.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-encoder.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c index f3d2c2b4d512..47c8e0203ce7 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c | |||
@@ -22,8 +22,6 @@ | |||
22 | 22 | ||
23 | #include <linux/device.h> // for linux/firmware.h | 23 | #include <linux/device.h> // for linux/firmware.h |
24 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
25 | #include <linux/videodev2.h> | ||
26 | #include <media/cx2341x.h> | ||
27 | #include "pvrusb2-util.h" | 25 | #include "pvrusb2-util.h" |
28 | #include "pvrusb2-encoder.h" | 26 | #include "pvrusb2-encoder.h" |
29 | #include "pvrusb2-hdw-internal.h" | 27 | #include "pvrusb2-hdw-internal.h" |
@@ -166,6 +164,7 @@ static int pvr2_encoder_cmd(void *ctxt, | |||
166 | u32 rdData[16]; | 164 | u32 rdData[16]; |
167 | struct pvr2_hdw *hdw = (struct pvr2_hdw *)ctxt; | 165 | struct pvr2_hdw *hdw = (struct pvr2_hdw *)ctxt; |
168 | 166 | ||
167 | |||
169 | /* | 168 | /* |
170 | 169 | ||
171 | The encoder seems to speak entirely using blocks 32 bit words. | 170 | The encoder seems to speak entirely using blocks 32 bit words. |
@@ -339,7 +338,7 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw) | |||
339 | is_30fps=0; | 338 | is_30fps=0; |
340 | } | 339 | } |
341 | 340 | ||
342 | pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure"); | 341 | pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure (native)"); |
343 | 342 | ||
344 | /* set stream output port. Some notes here: The ivtv-derived | 343 | /* set stream output port. Some notes here: The ivtv-derived |
345 | encoder documentation says that this command only gets a | 344 | encoder documentation says that this command only gets a |