Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8f3ceefaed1493edfbd622026bced706055b8318

Authored by Miroslav Slugen
Committed by Greg Kroah-Hartman
1 parent fe77de3ae1

tuner: Fix numberspace conflict between xc4000 and pti 5nf05 tuners 

commit cd4ca7afc61d3b18fcd635002459fb6b1d701099 upstream.

Update xc4000 tuner definition, number 81 is already in use by
TUNER_PARTSNIC_PTI_5NF05.

Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/media/tuner.h
Diff comments   View file @ 8f3ceef
... ... @@ -127,7 +127,6 @@
127 127 #define TUNER_PHILIPS_FMD1216MEX_MK3 78
128 128 #define TUNER_PHILIPS_FM1216MK5 79
129 129 #define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */
130   -#define TUNER_XC4000 81 /* Xceive Silicon Tuner */
131 130  
132 131 #define TUNER_PARTSNIC_PTI_5NF05 81
133 132 #define TUNER_PHILIPS_CU1216L 82
... ... @@ -135,6 +134,8 @@
135 134 #define TUNER_SONY_BTF_PXN01Z 84
136 135 #define TUNER_PHILIPS_FQ1236_MK5 85 /* NTSC, TDA9885, no FM radio */
137 136 #define TUNER_TENA_TNF_5337 86
  137 +
  138 +#define TUNER_XC4000 87 /* Xceive Silicon Tuner */
138 139  
139 140 /* tv card specific */
140 141 #define TDA9887_PRESENT (1<<0)