diff options
author | Miroslav Slugen <thunder.mmm@gmail.com> | 2011-12-11 16:47:32 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 08:55:48 -0500 |
commit | cd4ca7afc61d3b18fcd635002459fb6b1d701099 (patch) | |
tree | 4d15df79febdf8cdfada3a6859f7075688258ac3 /include/media | |
parent | b6854e3f31402476bcc9d2f41570389fa491de17 (diff) |
[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: Miroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/tuner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h index 89c290b69a5c..29e1920e7339 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -127,7 +127,6 @@ | |||
127 | #define TUNER_PHILIPS_FMD1216MEX_MK3 78 | 127 | #define TUNER_PHILIPS_FMD1216MEX_MK3 78 |
128 | #define TUNER_PHILIPS_FM1216MK5 79 | 128 | #define TUNER_PHILIPS_FM1216MK5 79 |
129 | #define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ | 129 | #define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ |
130 | #define TUNER_XC4000 81 /* Xceive Silicon Tuner */ | ||
131 | 130 | ||
132 | #define TUNER_PARTSNIC_PTI_5NF05 81 | 131 | #define TUNER_PARTSNIC_PTI_5NF05 81 |
133 | #define TUNER_PHILIPS_CU1216L 82 | 132 | #define TUNER_PHILIPS_CU1216L 82 |
@@ -136,6 +135,8 @@ | |||
136 | #define TUNER_PHILIPS_FQ1236_MK5 85 /* NTSC, TDA9885, no FM radio */ | 135 | #define TUNER_PHILIPS_FQ1236_MK5 85 /* NTSC, TDA9885, no FM radio */ |
137 | #define TUNER_TENA_TNF_5337 86 | 136 | #define TUNER_TENA_TNF_5337 86 |
138 | 137 | ||
138 | #define TUNER_XC4000 87 /* Xceive Silicon Tuner */ | ||
139 | |||
139 | /* tv card specific */ | 140 | /* tv card specific */ |
140 | #define TDA9887_PRESENT (1<<0) | 141 | #define TDA9887_PRESENT (1<<0) |
141 | #define TDA9887_PORT1_INACTIVE (1<<1) | 142 | #define TDA9887_PORT1_INACTIVE (1<<1) |