summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cimax2.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-18 12:17:14 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-18 12:17:14 -0300
commit976a91082e499203f3700aa589a54aefedc3c22a (patch)
tree311541d0a78d789d3f59dbba22637ce262227f51 /linux/drivers/media/video/cx23885/cimax2.c
parentd42d95e43ed8a60e001ff0a8a4f323380098be7d (diff)
parent70bbc9f369222fa300c1fcb727eefd22da4db452 (diff)
downloadmediapointer-dvb-s2-976a91082e499203f3700aa589a54aefedc3c22a.tar.gz
mediapointer-dvb-s2-976a91082e499203f3700aa589a54aefedc3c22a.tar.bz2
merge: http://linuxtv.org/hg/~dheitmueller/hvr950q-analog2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cimax2.c')
-rw-r--r--linux/drivers/media/video/cx23885/cimax2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx23885/cimax2.c b/linux/drivers/media/video/cx23885/cimax2.c
index 193d9b4cc..0e29f97f3 100644
--- a/linux/drivers/media/video/cx23885/cimax2.c
+++ b/linux/drivers/media/video/cx23885/cimax2.c
@@ -157,7 +157,7 @@ int netup_ci_get_mem(struct cx23885_dev *dev)
}
int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
- u8 flag, u8 read, u8 addr, u8 data)
+ u8 flag, u8 read, int addr, u8 data)
{
struct netup_ci_state *state = en50221->data;
struct cx23885_tsport *port = state->priv;