summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx231xx/cx231xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 09:13:15 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 09:13:15 -0300
commitf6495a8c62646591f7785527b923544dfddc7019 (patch)
tree297ca776a6d5b8c8ded83c29d491af6ef3e5295a /linux/drivers/media/video/cx231xx/cx231xx.h
parentff417333f92b9ebf9523167136785d69bb73fab6 (diff)
parent8e9cc981e8c7b756ee8da597dbd9861e86f53cbf (diff)
downloadmediapointer-dvb-s2-f6495a8c62646591f7785527b923544dfddc7019.tar.gz
mediapointer-dvb-s2-f6495a8c62646591f7785527b923544dfddc7019.tar.bz2
merge: http://kernellabs.com/hg/~stoth/tda10048-merge
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 */