Hi Jeremy, On Tue, Dec 19, 2017 at 04:35:13PM +0000, Jeremy Sowden wrote: > diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h > index 2283dd1c1c9b..2de9f8eda2da 100644 > --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h > +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h > @@ -94,14 +94,4 @@ union ia_css_all_memory_offsets { > } array[IA_CSS_NUM_PARAM_CLASSES]; > }; > > -#define IA_CSS_DEFAULT_ISP_MEM_PARAMS \ > - { { { { 0, 0 } } } } There was a minor conflict here, another patch had changed the first 0 to NULL. The lines were removed so that was trivial to resolve. The patch is now applied in my atomisp branch. -- Sakari Ailus e-mail: sakari.ailus@xxxxxx