summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-i2c.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-12 00:38:33 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-12 00:38:33 -0200
commitc30e05a83632aeb144f9d3912d39162564244a34 (patch)
tree9877e4ed4167591ccb709ffbee27d7766986dabb /linux/drivers/media/video/ivtv/ivtv-i2c.h
parentba8e7e903d8aaa290f8528c1beba1284c1d33ddf (diff)
parente2b3b766697ca509f1281178161156ab8df5b0d5 (diff)
downloadmediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.gz
mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-i2c.h')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-i2c.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.h b/linux/drivers/media/video/ivtv/ivtv-i2c.h
index de6a07442..022978cf5 100644
--- a/linux/drivers/media/video/ivtv/ivtv-i2c.h
+++ b/linux/drivers/media/video/ivtv/ivtv-i2c.h
@@ -33,9 +33,10 @@ int ivtv_i2c_hw(struct ivtv *itv, u32 hw, unsigned int cmd, void *arg);
int ivtv_i2c_id(struct ivtv *itv, u32 id, unsigned int cmd, void *arg);
int ivtv_call_i2c_client(struct ivtv *itv, int addr, unsigned int cmd, void *arg);
void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg);
+int ivtv_i2c_register(struct ivtv *itv, unsigned idx);
/* init + register i2c algo-bit adapter */
-int __devinit init_ivtv_i2c(struct ivtv *itv);
+int init_ivtv_i2c(struct ivtv *itv);
void exit_ivtv_i2c(struct ivtv *itv);
#endif