[111/129] [media] tuner: Fix numberspace conflict between xc4000 and pti 5nf05 tuners
From: Greg KH <gregkh@suse.de>
Date: 2012-01-24 02:48:20
Also in:
lkml
3.2-stable review patch. If anyone has any objections, please let me know. ------------------ Content-Length: 1092 Lines: 35 From: Miroslav Slugen <redacted> commit cd4ca7afc61d3b18fcd635002459fb6b1d701099 upstream. Update xc4000 tuner definition, number 81 is already in use by TUNER_PARTSNIC_PTI_5NF05. Signed-off-by: Miroslav Slugen <redacted> Signed-off-by: Mauro Carvalho Chehab <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- include/media/tuner.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h@@ -127,7 +127,6 @@ #define TUNER_PHILIPS_FMD1216MEX_MK3 78 #define TUNER_PHILIPS_FM1216MK5 79 #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_PHILIPS_CU1216L 82
@@ -136,6 +135,8 @@ #define TUNER_PHILIPS_FQ1236_MK5 85 /* NTSC, TDA9885, no FM radio */ #define TUNER_TENA_TNF_5337 86 +#define TUNER_XC4000 87 /* Xceive Silicon Tuner */ + /* tv card specific */ #define TDA9887_PRESENT (1<<0) #define TDA9887_PORT1_INACTIVE (1<<1)