diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:18 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 02:05:24 +0200 |
| commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
| tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /include/media/tuner.h | |
| parent | drm: radeon: fix sign bug (diff) | |
| parent | Linux 2.6.35-rc6 (diff) | |
| download | linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.tar.xz linux-d656ae53f64cb0f01dac8a02c4d31453d64ef97c.zip | |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'include/media/tuner.h')
| -rw-r--r-- | include/media/tuner.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h index 5505c5360ca3..51811eac46f1 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h @@ -130,6 +130,7 @@ #define TUNER_PHILIPS_CU1216L 82 #define TUNER_NXP_TDA18271 83 #define TUNER_SONY_BTF_PXN01Z 84 +#define TUNER_PHILIPS_FQ1236_MK5 85 /* NTSC, TDA9885, no FM radio */ /* tv card specific */ #define TDA9887_PRESENT (1<<0) |