summaryrefslogtreecommitdiff
path: root/v4l/scripts/merge-trees.sh
AgeCommit message (Collapse)Author
2005-07-25Rename lgdt3302 to lgdt330x.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-24 * cx88-dvb.c, saa7134-dvb.c, Makefile:Michael Krufky
- The #define CONFIG_DVB_* are actually CFLAGS set my Makefile. CONFIG_* namespace is reserved for Kconfig. This renames them back to HAVE_*. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-23 * cx88-dvb.c, saa7134-dvb.c:Michael Krufky
* scripts/merge-trees.sh, scripts/unmerge-trees.sh: - fix compilation warning for missing lgdt3302 when compiling against kernel 2.6.12 without DVB tree. - replaced #IF CONFIG_DVB_* with #IFDEF CONFIG_DVB_* - include linux/config.h - Let kconfig / Makefile decide to include frontend-specific code. (Properly functioning now) Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-22Minor changes to v4l/dvb tree merging/unmerging scripts.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-22 * scripts/merge-trees.sh:Michael Krufky
- New script to symlink DVB frontend code from dvb-kernel cvs tree into patched video4linux cvs tree for testing and development across both trees. * scripts/unmerge-trees.sh: - New script to be run after development, and before generating patches or making cvs commits. This removes the symlinks to the frontend code, and reverts the patch to the video4linux tree created by merge-trees.sh . Signed-off-by: Michael Krufky <mkrufky@m1k.net>