On Fri, Oct 22, 2010 at 09:25:47AM +0200, Sylwester Nawrocki wrote: > > This code is properly removed in my original patch. But it has been added > again during a merge conflict solving. Unfortunately I cannot identify the > merge commit today in linux-next. > As for sched.h, it needs a separate patch so I could handle it and add you > as reported by it is OK. >
I thought it was probably a merge conflict. Thanks for taking care of this. regards, dan carpenter > Regards, > Sylwester > > > ret = fimc_register_m2m_device(fimc); > > if (ret) > > goto err_irq; -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
