summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-cards.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-16 11:55:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-16 11:55:09 -0300
commitef1300c8dfd94bca1d2bc80ea3629d644e23ef3b (patch)
treeebd1925c473e3bb71372fda123435b4c8e241af0 /linux/drivers/media/video/cx18/cx18-cards.h
parentc4a8a2e49ee685a2e77215fc26bda43415a6df1d (diff)
parent686cc1c1d15e11ccb0bd3687091cd989974d9e91 (diff)
downloadmediapointer-dvb-s2-ef1300c8dfd94bca1d2bc80ea3629d644e23ef3b.tar.gz
mediapointer-dvb-s2-ef1300c8dfd94bca1d2bc80ea3629d644e23ef3b.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-cards.h')
-rw-r--r--linux/drivers/media/video/cx18/cx18-cards.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-cards.h b/linux/drivers/media/video/cx18/cx18-cards.h
index dc283d756..32155f6e6 100644
--- a/linux/drivers/media/video/cx18/cx18-cards.h
+++ b/linux/drivers/media/video/cx18/cx18-cards.h
@@ -83,6 +83,7 @@ struct cx18_gpio_i2c_slave_reset {
u32 active_hi_mask; /* GPIO outputs that reset i2c chips when high */
int msecs_asserted; /* time period reset must remain asserted */
int msecs_recovery; /* time after deassert for chips to be ready */
+ u32 ir_reset_mask; /* GPIO to reset the Zilog Z8F0811 IR contoller */
};
struct cx18_gpio_audio_input { /* select tuner/line in input */