On Tue, 2012-10-09 at 12:54 +0000, Hiremath, Vaibhav wrote: > On Tue, Oct 09, 2012 at 18:00:25, Valkeinen, Tomi wrote: > > Now that vrfb driver is not omap dependent anymore, we can move vrfb.h > > from arch/arm/plat-omap/include/plat to include/video/omapvrfb.h. > > > > Which baseline you are using? I tried it with linux-omap/master, patch[1/3] is failing - It's based on omapdss master, which is what I've sent in the pull request for 3.7. > patching file arch/arm/plat-omap/include/plat/vrfb.h > patching file drivers/media/video/omap/omap_vout.c > Hunk #1 FAILED at 45. > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/omap/omap_vout.c.rej > patching file drivers/media/video/omap/omap_vout_vrfb.c > Hunk #1 FAILED at 17. > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/omap/omap_vout_vrfb.c.rej > patching file drivers/media/video/omap/omap_voutdef.h > Hunk #1 FAILED at 12. > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/omap/omap_voutdef.h.rej > patching file drivers/video/omap2/omapfb/omapfb-ioctl.c > patching file drivers/video/omap2/omapfb/omapfb-main.c > Hunk #1 succeeded at 33 with fuzz 2 (offset 1 line). > patching file drivers/video/omap2/omapfb/omapfb-sysfs.c > patching file drivers/video/omap2/vrfb.c > patching file include/video/omapvrfb.h > > > > Note that, the directory structure has been changed in the mainline, > Now V4L2 OMAP Display driver is in "drivers/media/platform/omap/" > > You have to rebase the patches and resend it. Yep, I'll rebase it on top of 3.7-rc1 when that's out, so that Tony can pull that branch into his tree also. I guess the omap_vout changes should apply easily, as it's just include filename changes. Tomi
Attachment:
signature.asc
Description: This is a digitally signed message part
