diff options
| author | Kate Hsuan <hpa@redhat.com> | 2023-07-13 13:02:23 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-09-27 10:40:03 +0300 |
| commit | 2aea82b03cd4e57f3d639d3bedb0876082416052 (patch) | |
| tree | 43f7ca6a9326023a1ad7e843651597c736b68aa9 /drivers/staging/media/atomisp/pci/input_system_local.h | |
| parent | 8fc67b18fa1ccaf8c35919f27ccb119fdc2a35a8 (diff) | |
| download | linux-2aea82b03cd4e57f3d639d3bedb0876082416052.tar.xz | |
media: atomisp: Included both input system headers
Included necessary input system header files (local, private, public
scopes) for both types of atomisp. There is also a conflict of
declaration issue so the unused input_system_state_s is removed.
Link: https://lore.kernel.org/r/20230713100231.308923-4-hpa@redhat.com
Signed-off-by: Kate Hsuan <hpa@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/input_system_local.h')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/input_system_local.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/media/atomisp/pci/input_system_local.h b/drivers/staging/media/atomisp/pci/input_system_local.h index 357987d629cd..12f7acfeb79c 100644 --- a/drivers/staging/media/atomisp/pci/input_system_local.h +++ b/drivers/staging/media/atomisp/pci/input_system_local.h @@ -138,8 +138,5 @@ struct rx_cfg_s { bool is_two_ppc; }; -#ifdef ISP2401 -# include "isp2401_input_system_local.h" -#else -# include "isp2400_input_system_local.h" -#endif +#include "isp2401_input_system_local.h" +#include "isp2400_input_system_local.h" |