diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-07-20 12:47:10 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-09-03 12:11:47 +0200 |
| commit | 5ad658c0038f79014e7d644dd8e16630225bfce2 (patch) | |
| tree | b34955cf617097afceae4165246036c9a8528037 | |
| parent | 8a8e36facd60014ac1b0155a370eec8d564db63e (diff) | |
| download | linux-5ad658c0038f79014e7d644dd8e16630225bfce2.tar.bz2 | |
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 <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/staging/media/atomisp/pci/input_system_global.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/media/atomisp/pci/input_system_global.h b/drivers/staging/media/atomisp/pci/input_system_global.h index 5929d529950b..1450964445f6 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__ */ |