* hvaibhav@xxxxxx <hvaibhav@xxxxxx> [100319 02:34]: > From: Vaibhav Hiremath <hvaibhav@xxxxxx> > > AM3517 and DM644x uses same CCDC IP, so reusing the driver > for AM3517. > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > --- > arch/arm/mach-omap2/board-am3517evm.c | 160 +++++++++++++++++++++++++++++++++ > 1 files changed, 160 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c > index f04311f..d2d2ced 100644 > --- a/arch/arm/mach-omap2/board-am3517evm.c > +++ b/arch/arm/mach-omap2/board-am3517evm.c > @@ -30,11 +30,164 @@ > > #include <plat/board.h> > #include <plat/common.h> > +#include <plat/control.h> > #include <plat/usb.h> > #include <plat/display.h> > > +#include <media/tvp514x.h> > +#include <media/ti-media/vpfe_capture.h> > + At least the mainline kernel does not seem to have media/ti-media/, so I'm not taking this. Looks like it should be safe to merge via linux-media from omap point of view. Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> -- 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
