media: atomisp: remove compile-time tests from input_system_global.h
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 20 Jul 2020 10:47:10 +0000 (12:47 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 3 Sep 2020 10:11:47 +0000 (12:11 +0200)
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 <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/input_system_global.h

index 5929d52..1450964 100644 (file)
@@ -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__ */