Andy wrote: > I noticed there has been a change [1] to saa7134-dvb.c since you added support for the T200/T300 Hartmut. I have tried undoing the change > and recompiling, however this makes no difference. > > [1] http://www.linuxtv.org/cgi-bin/viewcvs.cgi/video4linux/saa7134-dvb.c?root=v4l&r1=1.27&r2=1.28 I made that change. I moved the #if macro into compat.h to clean up the code. This makes absolutely no difference in functionality, but it makes code readability easier, and leaves less work for the tree-merging scripts to patch, as well. In fact, I just realized ... I think I have to remove those lines from compat.h during the tree-merge as well... I'll get that into cvs in a few minutes. I'm the maintainer of those tree-merging scripts. I noticed you had some criticism: > # ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/demux.h ./demux.h > > As an aside, should the last line be added to merge-trees.sh??? I'll add it and see what happens... Quite frankly, the following was an experiment: ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvbdev.h dvbdev.h ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dmxdev.h dmxdev.h ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_demux.h dvb_demux.h ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_net.h dvb_net.h ln -s ../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_frontend.h dvb_frontend.h I'll try adding demux.h to the merge, see if it helps anyone. I doubt it can hurt. -- Michael Krufky