Skip to content

Commit d0b674a

Browse files
committed
media: atomisp: get rid of ifdef nonsense
There are some ifdefs there that end doing the same thing. Get rid of them. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 35a933d commit d0b674a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/staging/media/atomisp/pci/isp2400_input_system_local.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
#include "input_system_global.h"
2222

2323
#include "input_system_defs.h" /* HIVE_ISYS_GPREG_MULTICAST_A_IDX,... */
24-
#include "css_receiver_2400_defs.h" /* _HRT_CSS_RECEIVER_2400_TWO_PIXEL_EN_REG_IDX, _HRT_CSS_RECEIVER_2400_CSI2_FUNC_PROG_REG_IDX,... */
25-
#if defined(IS_ISP_2400_MAMOIADA_SYSTEM)
26-
#include "isp_capture_defs.h"
27-
#elif defined(IS_ISP_2401_MAMOIADA_SYSTEM)
28-
/* Same name, but keep the distinction,it is a different device */
24+
25+
/*
26+
* _HRT_CSS_RECEIVER_2400_TWO_PIXEL_EN_REG_IDX,
27+
* _HRT_CSS_RECEIVER_2400_CSI2_FUNC_PROG_REG_IDX,...
28+
*/
29+
#include "css_receiver_2400_defs.h"
30+
2931
#include "isp_capture_defs.h"
30-
#else
31-
#error "input_system_local.h: 2400_SYSTEM must be one of {2400, 2401 }"
32-
#endif
32+
3333
#include "isp_acquisition_defs.h"
3434
#include "input_system_ctrl_defs.h"
3535

0 commit comments

Comments
 (0)