On Mon, Mar 12, 2012 at 06:28:51PM +0200, Alex wrote: > In i.MX35-PDK, OV2640 camera is populated on the > personality board. This camera is registered as a subdevice via soc-camera interface. > > Signed-off-by: Alex Gershgorin <alexg@xxxxxxxxxxxxxx> > --- > arch/arm/mach-imx/mach-mx35_3ds.c | 87 +++++++++++++++++++++++++++++++++++++ > 1 files changed, 87 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c This one does not apply as it is obviously based on (an earlier version of) the framebuffer patches of this board. Please always base your stuff on some -rc kernel. We can resolve conflicts later upstream, but we cannot easily apply a patch when we do not have the correct base. Please add the linux arm kernel mailing list next time. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- 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