From: Alan Cox Date: Fri, 10 Mar 2017 11:35:17 +0000 (+0000) Subject: atomisp: remove FPGA defines X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c537f916d0402b593040034d9c1d96b71584f53d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git atomisp: remove FPGA defines These are not relevant to an upstream kernel driver. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h index 603ef1d2c5ef..342553d10e08 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h @@ -30,21 +30,6 @@ #include #include #include -#ifdef _HIVE_ISP_CSS_FPGA_SYSTEM - #include - #include - #include - #include - #include - #include -#define hrt_gdc_slave_port(gdc_id) HRTCAT(gdc_id,_sl_in) - #include - #include - #include "isp_css_dev_flash_hrt.h" - #include "isp_css_dev_display_hrt.h" - #include "isp_css_dev_i2c_hrt.h" - #include "isp_css_dev_tb.h" -#else /* CSS ASIC system */ #include // #include // #include @@ -63,7 +48,6 @@ #error "hive_isp_css_hrt_modified.h: SYSTEM must be one of {2400_MAMOIADA_SYSTEM, 2401_MAMOIADA_SYSTEM}" #endif #endif -#endif /* _HIVE_ISP_CSS_FPGA_SYSTEM */ #include #include #include