diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-12 10:43:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-12 10:43:08 -0800 |
| commit | 2ab9c9675fe892e7fe9fa8c0a6125e2b40d2889d (patch) | |
| tree | 63c612009afaf5f4431374cf4b83648c43ae77e4 /drivers/staging | |
| parent | 49008f0cc1ef0b86ccfa0d1d99e67741d46bd35b (diff) | |
| parent | 8d4ff8187bb2b0c9025269f0da42ed16c878cb18 (diff) | |
Merge tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- some fixes at si2157 tuning logic
- a warning fix on atomisp when used with clang
* tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: si2157: add support for DVB-C Annex C
media: si2157: fix bandwidth stored in dev
media: si2157: fix 6MHz & 6.1MHz bandwidth setting
media: atomisp: Do not define input_system_cfg2400_t twice
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/isp2400_input_system_local.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h index 6880c9b6aa65..c3ae5014a039 100644 --- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h +++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h @@ -29,8 +29,6 @@ #include "isp_acquisition_defs.h" #include "input_system_ctrl_defs.h" -typedef struct input_system_cfg2400_s input_system_cfg2400_t; - struct target_cfg2400_s { input_switch_cfg_channel_t input_switch_channel_cfg; target_isp_cfg_t target_isp_cfg; |