diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 01:16:55 (GMT) |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 01:16:55 (GMT) |
commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /include/media/tuner.h | |
parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
download | linux-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.xz |
Merge commit 'origin/master' into next
Diffstat (limited to 'include/media/tuner.h')
-rw-r--r-- | include/media/tuner.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h index 7d4e2db..cbf97f4 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h @@ -124,6 +124,8 @@ #define TUNER_XC5000 76 /* Xceive Silicon Tuner */ #define TUNER_TCL_MF02GIP_5N 77 /* TCL MF02GIP_5N */ #define TUNER_PHILIPS_FMD1216MEX_MK3 78 +#define TUNER_PHILIPS_FM1216MK5 79 +#define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ /* tv card specific */ #define TDA9887_PRESENT (1<<0) |