Hello Devin/Mauro, On Fri, May 7, 2010 at 11:52 AM, Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> wrote: > Devin Heitmueller wrote: >> Hello, >> >> Please PULL from http://kernellabs.com/hg/~dheitmueller/ngene2 for the >> following: >> > > Hi Devin, > > As agreed via IRC with you and stoth, I'm applying all patches, except > for the ones that are currently creating unused files at the building > system. Let's apply them after you have added some code running there. > >> ngene: properly support boards where channel 0 isn't a TS input >> ngene: add initial support for digital side of Avermedia m780 >> ngene: split out i2c code into a separate file > Committed. > >> ngene: split out card specific code into a separate file >> ngene: split out DVB audio/video into a separate file > Not merged: it just creates a file with currently unused code. > >> ngene: move more card-specific code to ngene-cards.c > This patch were folded with "ngene: split out card specific code into a separate file". > >> ngene: split out eeprom functions int a separate file >> ngene: move a few more DVB a/v related functions > Not merged: they just create a file with currently unused code. > >> ngene: start separating out DVB functions into separate file > Committed, with a few trivial conflict resolving changes, caused by > not merging the 3 previous patches. > >> ngene: Add lgdt3303 and mt2131 deps to Kconfig > Committed. > > I've stored locally the rebased diffs for the non-applied patches. So, > on your next ngene pull, you won't need to rebase against my git. > > It should also be noticed that I needed to apply one patch before > your series, in order to fix those compilation errors: > > drivers/media/dvb/ngene/ngene-cards.c:42:20: error: mt2131.h: Arquivo ou diretório não encontrado > drivers/media/dvb/ngene/ngene-cards.c:111: error: variable ‘m780_tunerconfig’ has initializer but incomplete type > drivers/media/dvb/ngene/ngene-cards.c:113: warning: excess elements in struct initializer > drivers/media/dvb/ngene/ngene-cards.c:113: warning: (near initialization for ‘m780_tunerconfig’) > drivers/media/dvb/ngene/ngene-cards.c: In function ‘demod_attach_lg330x’: > drivers/media/dvb/ngene/ngene-cards.c:126: error: ‘mt2131_attach’ undeclared (first use in this function) > drivers/media/dvb/ngene/ngene-cards.c:126: error: (Each undeclared identifier is reported only once > drivers/media/dvb/ngene/ngene-cards.c:126: error: for each function it appears in.) > drivers/media/dvb/ngene/ngene-cards.c:126: warning: type defaults to ‘int’ in declaration of ‘__a’ > drivers/media/dvb/ngene/ngene-cards.c:126: warning: type defaults to ‘int’ in declaration of ‘type name’ > drivers/media/dvb/ngene/ngene-cards.c:126: warning: type defaults to ‘int’ in declaration of ‘type name’ > drivers/media/dvb/ngene/ngene-cards.c:126: error: called object ‘__a’ is not a function > > The fix were to just add the proper tuner include directory: > > --- a/drivers/media/dvb/ngene/Makefile > +++ b/drivers/media/dvb/ngene/Makefile > @@ -8,4 +8,4 @@ obj-$(CONFIG_DVB_NGENE) += ngene.o > > EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ > EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ > - > +EXTRA_CFLAGS += -Idrivers/media/common/tuners/ > > Douglas, > > It seems to me that the better option is if you just pull from ngene2 tree > at hg. This will produce a small diff between -git and -hg, but, as according > with Devin, they'll send soon an update on ngene driver adding some working > code for eeprom and ngene-av, it should probably be ok for you to handle > this difference for a couple weeks, especially since it won't produce any > runtime difference. > > Of course, it is up to you to decide, as you're the maintainer of the > backport tree ;) I have merged all patches from http://kernellabs.com/hg/~dheitmueller/ngene2. Cheers, Douglas -- 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
