]> git.baikalelectronics.ru Git - kernel.git/commit
media: atomisp: get rid of ia_css_sc_param.h version dependency
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 29 Apr 2020 09:50:52 +0000 (11:50 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 20 May 2020 10:32:18 +0000 (12:32 +0200)
commite2270bb090446e1251fc55ac5efa9d4fc39a2c17
tree9cc1456f032a67e1b22e098f59136ec13bb8ffe3
parentf16c7af99c0a44525f2fd10c4422e68a7d395128
media: atomisp: get rid of ia_css_sc_param.h version dependency

That's the last header file which had ifdefs for ISP2401.

The problem is that the conflicting dependencies were on another
file (sh_css_defs.h). Move the conflicting code to it, adding
a prefix which would describe what version the macro applies.

Then, ensure that binary.c will use the right version,
according with the hardware version.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h