From: Mauro Carvalho Chehab Date: Mon, 20 Jul 2020 10:47:10 +0000 (+0200) Subject: media: atomisp: remove compile-time tests from input_system_global.h X-Git-Tag: v5.10-rc1~175^2~305 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ad658c0038f79014e7d644dd8e16630225bfce2;p=thirdparty%2Fkernel%2Flinux.git media: atomisp: remove compile-time tests from input_system_global.h Now that there's no duplication between ISP2400 and ISP2401 input system functions, we can include both at the system global. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/atomisp/pci/input_system_global.h b/drivers/staging/media/atomisp/pci/input_system_global.h index 5929d529950b6..1450964445f66 100644 --- a/drivers/staging/media/atomisp/pci/input_system_global.h +++ b/drivers/staging/media/atomisp/pci/input_system_global.h @@ -24,10 +24,7 @@ typedef enum { INPUT_SYSTEM_ERR_PARAMETER_NOT_SUPPORTED, } input_system_err_t; -#ifdef ISP2401 -# include "isp2401_input_system_global.h" -#else -# include "isp2400_input_system_global.h" -#endif +#include "isp2401_input_system_global.h" +#include "isp2400_input_system_global.h" #endif /* __INPUT_SYSTEM_GLOBAL_H_INCLUDED__ */