Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd4ca7af authored by Miroslav Slugen's avatar Miroslav Slugen Committed by Mauro Carvalho Chehab
Browse files

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



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

Cc: stable@kernel.org
Signed-off-by: default avatarMiroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b6854e3f

include/media/tuner.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,6 @@ 
#define TUNER_PHILIPS_FMD1216MEX_MK3	78

#define TUNER_PHILIPS_FMD1216MEX_MK3	78

#define TUNER_PHILIPS_FM1216MK5		79

#define TUNER_PHILIPS_FM1216MK5		79

#define TUNER_PHILIPS_FQ1216LME_MK3	80	/* Active loopthrough, no FM */

#define TUNER_PHILIPS_FQ1216LME_MK3	80	/* Active loopthrough, no FM */

#define TUNER_XC4000			81	/* Xceive Silicon Tuner */





#define TUNER_PARTSNIC_PTI_5NF05	81

#define TUNER_PARTSNIC_PTI_5NF05	81

#define TUNER_PHILIPS_CU1216L           82

#define TUNER_PHILIPS_CU1216L           82
@@ -136,6 +135,8 @@ 
#define TUNER_PHILIPS_FQ1236_MK5	85	/* NTSC, TDA9885, no FM radio */

#define TUNER_PHILIPS_FQ1236_MK5	85	/* NTSC, TDA9885, no FM radio */

#define TUNER_TENA_TNF_5337		86

#define TUNER_TENA_TNF_5337		86





#define TUNER_XC4000			87	/* Xceive Silicon Tuner */



/* tv card specific */

/* tv card specific */

#define TDA9887_PRESENT 		(1<<0)

#define TDA9887_PRESENT 		(1<<0)

#define TDA9887_PORT1_INACTIVE 		(1<<1)

#define TDA9887_PORT1_INACTIVE 		(1<<1)