Friday 24 September 2010 01:23:10 Tony Lindgren napisaÅ(a): > * Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx> [100910 18:26]: > > This patch adds support for SoC camera interface to OMAP1 devices. > > > > Created and tested against linux-2.6.36-rc3 on Amstrad Delta. > > > > For successfull compilation, requires a header file provided by PATCH 1/6 > > from this series, "SoC Camera: add driver for OMAP1 camera interface". > > <snip> > > > diff -upr linux-2.6.36-rc3.orig/arch/arm/mach-omap1/include/mach/camera.h > > linux-2.6.36-rc3/arch/arm/mach-omap1/include/mach/camera.h > > --- > > linux-2.6.36-rc3.orig/arch/arm/mach-omap1/include/mach/camera.h 2010-09-0 > >3 22:34:03.000000000 +0200 +++ > > linux-2.6.36-rc3/arch/arm/mach-omap1/include/mach/camera.h 2010-09-09 > > 18:42:30.000000000 +0200 @@ -0,0 +1,8 @@ > > +#ifndef __ASM_ARCH_CAMERA_H_ > > +#define __ASM_ARCH_CAMERA_H_ > > + > > +#include <media/omap1_camera.h> > > + > > +extern void omap1_set_camera_info(struct omap1_cam_platform_data *); > > + > > +#endif /* __ASM_ARCH_CAMERA_H_ */ > > Care to refresh this patch so it does not include media/omap1_camera.h? > > That way things keep building if I merge this one along with the omap > patches and the drivers/media patches can get merged their via media. > > I think you can just move the OMAP1_CAMERA_IOSIZE to the devices.c or > someplace like that? Tony, Not exactly. I use the OMAP1_CAMERA_IOSIZE inside the driver when reserving space for register cache. I think that I could just duplicate its definition in the devices.c for now, than clean things up with a folloup patch when both parts already get merged. Would this be acceptable? Thanks, Janusz > > Regards, > > Tony > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html