diff options
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/Makefile | 2 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 33 |
3 files changed, 43 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1d9cab862..e29ca7f7a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-10-18 21:59 mkrufky + + * ../v4l/Makefile: + * ../v4l/scripts/merge-trees.sh: + - Partially revert to old tree-merge method to resolve the bug: + dvb_dmx_init failed (errno = -12) + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-18 21:48 nshmyrev * ../linux/drivers/media/video/cx88/cx88-video.c: (radio_do_ioctl): diff --git a/v4l/Makefile b/v4l/Makefile index 78a5e1e18..cddc24e1f 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -177,7 +177,7 @@ links:: @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; # for merged-trees: - @find ../linux/drivers -name '*.[c,h]' -type l -exec ln -sf '{}' . \; +# @find ../linux/drivers -name '*.[c,h]' -type l -exec ln -sf '{}' . \; # @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \; diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 421b6846c..ffff46bce 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -24,6 +24,39 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do ln -f -s $DVB/$x $V4L/$x done +ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c +ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h +ln -s $V4L/drivers/media/dvb/frontends/mt352.c mt352.c +ln -s $V4L/drivers/media/dvb/frontends/mt352.h mt352.h +ln -s $V4L/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h +ln -s $V4L/drivers/media/dvb/frontends/cx22702.c cx22702.c +ln -s $V4L/drivers/media/dvb/frontends/cx22702.h cx22702.h +ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c +ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h +ln -s $V4L/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h +ln -s $V4L/drivers/media/dvb/frontends/or51132.c or51132.c +ln -s $V4L/drivers/media/dvb/frontends/or51132.h or51132.h +ln -s $V4L/drivers/media/dvb/frontends/tda1004x.c tda1004x.c +ln -s $V4L/drivers/media/dvb/frontends/tda1004x.h tda1004x.h +ln -s $V4L/drivers/media/dvb/frontends/sp887x.c sp887x.c +ln -s $V4L/drivers/media/dvb/frontends/sp887x.h sp887x.h +ln -s $V4L/drivers/media/dvb/frontends/nxt6000.c nxt6000.c +ln -s $V4L/drivers/media/dvb/frontends/nxt6000.h nxt6000.h +ln -s $V4L/drivers/media/dvb/frontends/nxt6000_priv.h nxt6000_priv.h +ln -s $V4L/drivers/media/dvb/frontends/cx24110.c cx24110.c +ln -s $V4L/drivers/media/dvb/frontends/cx24110.h cx24110.h +ln -s $V4L/drivers/media/dvb/frontends/or51211.c or51211.c +ln -s $V4L/drivers/media/dvb/frontends/or51211.h or51211.h +ln -s $V4L/drivers/media/dvb/bt8xx/bt878.c bt878.c +ln -s $V4L/drivers/media/dvb/bt8xx/bt878.h bt878.h +ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.c dvb-bt8xx.c +ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.h dvb-bt8xx.h +ln -s $V4L/drivers/media/dvb/bt8xx/dst.c dst.c +ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.c dst_ca.c +ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.h dst_ca.h +ln -s $V4L/drivers/media/dvb/bt8xx/dst_common.h dst_common.h +ln -s $V4L/drivers/media/dvb/bt8xx/dst_priv.h dst_priv.h + cd $CWD patch -p2 <<'DIFF' diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config |