Skip to content

Commit

Permalink
[media] tuner: Fix numberspace conflict between xc4000 and pti 5nf05 …
Browse files Browse the repository at this point in the history
…tuners

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

Cc: [email protected]
Signed-off-by: Miroslav Slugen <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
Miroslav Slugen authored and Mauro Carvalho Chehab committed Jan 16, 2012
1 parent b6854e3 commit cd4ca7a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/media/tuner.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit cd4ca7a

Please sign in to comment.