diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-10-04 07:52:13 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-10-04 07:52:13 +0200 |
| commit | c52e7b855b33ff2a3af57b1b1d114720cd39ec7e (patch) | |
| tree | ef07ae81d74bb4dbab3981ac198f1fb147c34243 /include/media | |
| parent | 4114978dcd24e72415276bba60ff4ff355970bbc (diff) | |
| parent | 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 (diff) | |
Merge tag 'v5.15-rc4' into media_tree
Linux 5.15-rc4
* tag 'v5.15-rc4': (320 commits)
Linux 5.15-rc4
elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings
objtool: print out the symbol type when complaining about it
kvm: fix objtool relocation warning
cachefiles: Fix oops in trace_cachefiles_mark_buried due to NULL object
drm/i915: fix blank screen booting crashes
hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field
hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field
hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field
hwmon: (pmbus/mp2975) Add missed POUT attribute for page 1 mp2975 controller
hwmon: (pmbus/ibm-cffps) max_power_out swap changes
hwmon: (occ) Fix P10 VRM temp sensors
thermal: Update information in MAINTAINERS
io_uring: kill fasync
sched: Always inline is_percpu_thread()
sched/fair: Null terminate buffer when updating tunable_scaling
sched/fair: Add ancestors of unthrottled undecayed cfs_rq
perf/core: fix userpage->time_enabled of inactive events
perf/x86/intel: Update event constraints for ICX
perf/x86: Reset destroy callback on event init failure
...
Diffstat (limited to 'include/media')
| -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 ff85d7227f91..a7796e0a3659 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h @@ -132,6 +132,7 @@ #define TUNER_SONY_BTF_PG472Z 89 /* PAL+SECAM */ #define TUNER_SONY_BTF_PK467Z 90 /* NTSC_JP */ #define TUNER_SONY_BTF_PB463Z 91 /* NTSC */ +#define TUNER_SI2157 92 /* tv card specific */ #define TDA9887_PRESENT (1<<0) |