diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
| commit | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (patch) | |
| tree | 3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /linux/drivers/media/video/cx88/cx88.h | |
| parent | f9533819a70608d97d03abd7766ffc3f1e3ea655 (diff) | |
| parent | 3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff) | |
| download | mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.gz mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.bz2 | |
Merging mkrufky pvrusb2 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 7a7219377..a03be58aa 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -69,7 +69,7 @@ /* need "shadow" registers for some write-only ones ... */ #define SHADOW_AUD_VOL_CTL 1 #define SHADOW_AUD_BAL_CTL 2 -#define SHADOW_MAX 2 +#define SHADOW_MAX 3 /* FM Radio deemphasis type */ enum cx88_deemph_type { @@ -198,6 +198,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_KWORLD_DVB_T_CX22702 43 #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44 #define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45 +#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, |