Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286407
b: refs/heads/master
c: cd4ca7a
h: refs/heads/master
i:
  286405: de5d3ea
  286403: efa07f9
  286399: d1e2e79
v: v3
  • Loading branch information
Miroslav Slugen authored and Mauro Carvalho Chehab committed Jan 16, 2012
1 parent 8339e2c commit da4c4f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6854e3f31402476bcc9d2f41570389fa491de17
refs/heads/master: cd4ca7afc61d3b18fcd635002459fb6b1d701099
3 changes: 2 additions & 1 deletion trunk/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 da4c4f4

Please sign in to comment.