diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:05:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:05:47 -0300 |
| commit | e671695e92889f4471901f0fd96b4495d60a6022 (patch) | |
| tree | b3c48e34b61237be7bf0869b8ff66bdc4dad2fb0 /linux/drivers/media/video/cx18/cx18-cards.h | |
| parent | 4969b6d8d0847eb8f756b4424f6eef2f2fe85677 (diff) | |
| parent | 592120ae5b01a9f0001734872622bebda6855195 (diff) | |
| download | mediapointer-dvb-s2-e671695e92889f4471901f0fd96b4495d60a6022.tar.gz mediapointer-dvb-s2-e671695e92889f4471901f0fd96b4495d60a6022.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/xc5000
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.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-cards.h b/linux/drivers/media/video/cx18/cx18-cards.h index bca249bdd..bccb67f0d 100644 --- a/linux/drivers/media/video/cx18/cx18-cards.h +++ b/linux/drivers/media/video/cx18/cx18-cards.h @@ -114,8 +114,8 @@ struct cx18_card_pci_info { /* The mask is the set of bits used by the operation */ struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */ - u16 direction; /* DIR setting. Leave to 0 if no init is needed */ - u16 initial_value; + u32 direction; /* DIR setting. Leave to 0 if no init is needed */ + u32 initial_value; }; struct cx18_card_tuner { @@ -153,6 +153,7 @@ struct cx18_card { struct cx18_card_audio_input radio_input; /* GPIO card-specific settings */ + u8 xceive_pin; /* XCeive tuner GPIO reset pin */ struct cx18_gpio_init gpio_init; struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS]; |