aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/pvrusb2/pvrusb2-encoder.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-06-25 20:04:25 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-27 00:17:23 -0300
commitc05c0462da0e3aac70ec5316ea500f9a7499cca7 (patch)
tree2879ef0856de3301cbb4bdc1ada44e433f7100cc /drivers/media/video/pvrusb2/pvrusb2-encoder.c
parent3948199e8aff71b1ebe3c1ff2749f42add17a41e (diff)
V4L/DVB (4236): Rearrange things in pvrusb2 driver in preparation for using cx2341x module
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-encoder.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-encoder.c5
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 f3d2c2b4d51..47c8e0203ce 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -22,8 +22,6 @@
#include <linux/device.h> // for linux/firmware.h
#include <linux/firmware.h>
-#include <linux/videodev2.h>
-#include <media/cx2341x.h>
#include "pvrusb2-util.h"
#include "pvrusb2-encoder.h"
#include "pvrusb2-hdw-internal.h"
@@ -166,6 +164,7 @@ static int pvr2_encoder_cmd(void *ctxt,
u32 rdData[16];
struct pvr2_hdw *hdw = (struct pvr2_hdw *)ctxt;
+
/*
The encoder seems to speak entirely using blocks 32 bit words.
@@ -339,7 +338,7 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw)
is_30fps=0;
}
- pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure");
+ pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure (native)");
/* set stream output port. Some notes here: The ivtv-derived
encoder documentation says that this command only gets a