This is an automatic generated email to let you know that the following patch were queued:
Subject: media: atomisp: drop duplicated ia_css_isp_states.c Author: Mauro Carvalho Chehab <[email protected]> Date: Fri Nov 5 11:09:02 2021 +0000 Both 2400 and 2401 have this file, but they're identical. So, drop one of them. Signed-off-by: Mauro Carvalho Chehab <[email protected]> drivers/staging/media/atomisp/Makefile | 5 +- .../pci/css_2401_system/hive/ia_css_isp_states.c | 224 --------------------- .../{css_2400_system/hive => }/ia_css_isp_states.c | 0 3 files changed, 2 insertions(+), 227 deletions(-) --- diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile index 320c14f4afa6..f7f670a70d3f 100644 --- a/drivers/staging/media/atomisp/Makefile +++ b/drivers/staging/media/atomisp/Makefile @@ -54,6 +54,7 @@ atomisp-objs += \ pci/hmm/hmm_reserved_pool.o \ pci/ia_css_device_access.o \ pci/ia_css_isp_configs.o \ + pci/ia_css_isp_states.o \ pci/isp/kernels/aa/aa_2/ia_css_aa2.host.o \ pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \ pci/isp/kernels/anr/anr_2/ia_css_anr2.host.o \ @@ -158,8 +159,7 @@ atomisp-objs += \ pci/system_local.o \ obj-byt = \ - pci/css_2400_system/hive/ia_css_isp_params.o \ - pci/css_2400_system/hive/ia_css_isp_states.o \ + pci/css_2400_system/hive/ia_css_isp_params.o # These will be needed when clean merge CHT support nicely into the driver # Keep them here handy for when we get to that point @@ -167,7 +167,6 @@ obj-byt = \ obj-cht = \ pci/css_2401_system/hive/ia_css_isp_params.o \ - pci/css_2401_system/hive/ia_css_isp_states.o \ pci/css_2401_system/host/csi_rx.o \ pci/css_2401_system/host/ibuf_ctrl.o \ pci/css_2401_system/host/isys_dma.o \ diff --git a/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c b/drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c deleted file mode 100644 index 514ffe0303cb..000000000000 diff --git a/drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_states.c b/drivers/staging/media/atomisp/pci/ia_css_isp_states.c similarity index 100% rename from drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_states.c rename to drivers/staging/media/atomisp/pci/ia_css_isp_states.c _______________________________________________ linuxtv-commits mailing list [email protected] https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
