Em 27-06-2010 12:14, Andy Walls escreveu: > On Sun, 2010-06-27 at 09:11 -0300, Mauro Carvalho Chehab wrote: >> Em 07-06-2010 16:32, David Härdeman escreveu: >>> Partially convert drivers/media/video/bt8xx/bttv-input.c to >>> not use ir-functions.c. >>> >>> Since the last user is gone with this patch, also remove a >>> bunch of code from ir-functions.c. >> >> This patch breakd mceusb driver: >> >> drivers/media/IR/mceusb.c: In function ‘mceusb_init_input_dev’: >> drivers/media/IR/mceusb.c:774: error: invalid application of ‘sizeof’ to incomplete type ‘struct ir_input_state’ >> drivers/media/IR/mceusb.c:785: error: implicit declaration of function ‘ir_input_init’ >> make[1]: ** [drivers/media/IR/mceusb.o] Erro 1 >> make[1]: ** Esperando que outros processos terminem. >> make: ** [drivers/media/IR/] Erro 2 >> >> Also, the description is wrong, since it changes not only bttv, but also cx23885 and saa7134. > > Mauro, > > I'll be removing the RC5 and NEC decoding from the cx23885 driver > hopefully by the end of the day. That will make parts of David's patch > obsolete. Ok. David, it is generally a good idea to break those patches into smaller ones, since, when conflicts like this happens, we can just discard a patch at the series, or move it to happen after another patch. > I'll be developing off of the v4l-dvb.git staging/rc branch. Is that > the right branch to use? Yes. I'll likely apply a few more patches there. > Also the IR registration Ooops is not patched in staging/rc, so the > cx23885 driver Oops-es on load. Is it OK if I pull in (fetch & merge) > the patch from some other branch, or would it be easier for you if I > just use an uncommitted patch in my working tree? Probably, it is ok if you send it with the fix pulled in. I'll handle the conflicts when sending upstream. Cheers, Mauro -- 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
