media: atomisp: get rid of ia_css_sc_param.h version dependency

Browse source

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>

...

This commit is contained in:

Mauro Carvalho Chehab 2020-04-29 11:50:52 +02:00

parent e6c1310370

commit 8022c2e292

3 changed files with 33 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

27

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h

View file

10

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c

View file

32

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h

View file