summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx231xx/cx231xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 10:40:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 10:40:37 -0300
commitfa6bf06d0bc8a417de4d20da09191a12baf5b6a4 (patch)
tree13405dea17647d9e929895152fb308320ca0795c /linux/drivers/media/video/cx231xx/cx231xx.h
parente04d6d72df5f7dfbf9d9355950617c7d3a041ea0 (diff)
parente869f37a082df276cbc412d3f7da04fd3b41fed4 (diff)
downloadmediapointer-dvb-s2-fa6bf06d0bc8a417de4d20da09191a12baf5b6a4.tar.gz
mediapointer-dvb-s2-fa6bf06d0bc8a417de4d20da09191a12baf5b6a4.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx231xx/cx231xx.h')
-rw-r--r--linux/drivers/media/video/cx231xx/cx231xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx231xx/cx231xx.h b/linux/drivers/media/video/cx231xx/cx231xx.h
index 21b4023dd..d3c05186e 100644
--- a/linux/drivers/media/video/cx231xx/cx231xx.h
+++ b/linux/drivers/media/video/cx231xx/cx231xx.h
@@ -747,7 +747,7 @@ extern void cx231xx_card_setup(struct cx231xx *dev);
extern struct cx231xx_board cx231xx_boards[];
extern struct usb_device_id cx231xx_id_table[];
extern const unsigned int cx231xx_bcount;
-void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir);
+void cx231xx_register_i2c_ir(struct cx231xx *dev);
int cx231xx_tuner_callback(void *ptr, int component, int command, int arg);
/* Provided by cx231xx-input.c */