Merge from master

From: Mike Isely <isely@pobox.com>



Signed-off-by: Mike Isely <isely@pobox.com>

4 files changed, 54 insertions, 26 deletions

diff --git a/v4l/Makefile b/v4l/Makefile
index fd757e928..ab94f891f 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -375,7 +375,9 @@ ivtv-links:: ivtv-checkout
 	@find ivtv/i2c-drivers -name '*.[ch]' -type f -exec ln -sf '{}' . \;
 
 ivtv:: ivtv-links
-	@echo '#define IVTV_DRIVER_VERSION_COMMENT "(v4l-dvb + ivtv virtual merge)"' > ivtv-svnversion.h
+	@echo '#define IVTV_DRIVER_VERSION_COMMENT ' \
+		'"(v4l-dvb + ivtv virtual merge)' \
+		"`svn info ivtv | grep Revision`"'"' > ivtv-svnversion.h
 	@echo ivtv trunk merged. Run make to build the entire tree.
 
 cx88-ivtv::
diff --git a/v4l/scripts/insmod.sh b/v4l/scripts/insmod.sh
index e4ebb1494..6efab6a82 100755
--- a/v4l/scripts/insmod.sh
+++ b/v4l/scripts/insmod.sh
@@ -27,11 +27,16 @@ case "$1" in
 	insmod ./cs53l32a.ko
 	insmod ./wm8775.ko
 	insmod ./cx25840.ko
-	insmod ./saa711x.ko
+	insmod ./saa7115.ko
 	insmod ./btcx-risc.ko
 	insmod ./saa7127.ko
 	insmod ./msp3400.ko
 	insmod ./tvp5150.ko
+	insmod ./tda7432.ko
+	insmod ./tda9840.ko
+	insmod ./tda9875.ko
+	insmod ./tea6415c.ko
+	insmod ./tea6420.ko
 	# DVB core
 	insmod ./dvb-core.ko # dvb_net_debug=1
 	# for hybrid cx88 and saa7134 cards
@@ -64,7 +69,9 @@ case "$1" in
 	insmod ./sp887x.ko
 	insmod ./or51211.ko
 	insmod ./or51132.ko
+	insmod ./zl10353.ko
 	insmod ./ttusbdecfe.ko
+
 	# saa7146 based siemens/technotrend/hauppauge cards
 	insmod ./saa7146.ko
 	insmod ./saa7146_vv.ko
@@ -74,6 +81,9 @@ case "$1" in
 	insmod ./budget.ko
 	insmod ./budget-ci.ko
 	insmod ./budget-av.ko
+	insmod ./mxb.ko
+	insmod ./hexium_gemini.ko
+	insmod ./hexium_orion.ko
 	# technotrend/hauppauge USB things
 	insmod ./dvb-ttusb-budget.ko
 	insmod ./ttusb_dec.ko
@@ -99,6 +109,7 @@ case "$1" in
 	insmod ./dvb-usb-digitv.ko
 	insmod ./dvb-usb-cxusb.ko
 	# bt8xx
+	insmod ./bt832.ko
 	insmod ./bttv.ko
 	insmod ./bt878.ko
 	insmod ./dst.ko
@@ -119,9 +130,11 @@ case "$1" in
 #	insmod ./saa7134-oss.ko
 	insmod ./saa7134-dvb.ko
 	insmod ./saa7134-empress.ko
-
 	insmod ./saa6752hs.ko
+
 	insmod ./em28xx.ko
+	insmod ./pvrusb2.ko
+	insmod ./cpia2.ko
 	insmod ./vivi.ko
 
 	echo
@@ -147,11 +160,16 @@ case "$1" in
 	insmod ./cs53l32a.ko
 	insmod ./wm8775.ko
 	insmod ./cx25840.ko
-	insmod ./saa711x.ko
+	insmod ./saa7115.ko
 	insmod ./btcx-risc.ko
 	insmod ./saa7127.ko
 	insmod ./msp3400.ko
 	insmod ./tvp5150.ko
+	insmod ./tda7432.ko
+	insmod ./tda9840.ko
+	insmod ./tda9875.ko
+	insmod ./tea6415c.ko
+	insmod ./tea6420.ko
 	insmod ./dvb-core.ko cam_debug=1
 	insmod ./video-buf-dvb.ko
 	insmod ./dvb-pll.ko
@@ -178,9 +196,10 @@ case "$1" in
 	insmod ./nxt6000.ko
 	insmod ./bcm3510.ko
 	insmod ./s5h1420.ko
-        insmod ./sp887x.ko
-        insmod ./or51211.ko
-        insmod ./or51132.ko
+	insmod ./sp887x.ko
+	insmod ./or51211.ko
+	insmod ./or51132.ko
+	insmod ./zl10353.ko
 	insmod ./ttusbdecfe.ko
 	insmod ./saa7146.ko
 	insmod ./saa7146_vv.ko
@@ -190,6 +209,9 @@ case "$1" in
 	insmod ./budget.ko
 	insmod ./budget-ci.ko
 	insmod ./budget-av.ko
+	insmod ./mxb.ko
+	insmod ./hexium_gemini.ko
+	insmod ./hexium_orion.ko
 	insmod ./dvb-ttusb-budget.ko
 	insmod ./stv0297_cs2.ko
 	insmod ./b2c2-flexcop.ko debug=0x01
@@ -211,6 +233,7 @@ case "$1" in
 	insmod ./dvb-usb-digitv.ko
 	insmod ./dvb-usb-cxusb.ko
 
+	insmod ./bt832.ko
 	insmod ./bttv.ko
 	insmod ./bt878.ko
 	insmod ./dst.ko
@@ -231,9 +254,11 @@ case "$1" in
 	insmod ./saa7134-oss.ko
 	insmod ./saa7134-dvb.ko
 	insmod ./saa7134-empress.ko
-
 	insmod ./saa6752hs.ko
+
 	insmod ./em28xx.ko
+	insmod ./pvrusb2.ko
+	insmod ./cpia2.ko
 	insmod ./vivi.ko
 	echo
 	;;
@@ -249,10 +274,11 @@ case "$1" in
 # video4linux cards
 	rmmod cx88-alsa cx88-blackbird cx88-dvb cx88-vp3054-i2c cx8802 cx8800 \
 		cx88xx saa7134-oss saa7134-alsa saa7134-empress saa7134-dvb \
-		saa7134 dvb-bt8xx dst_ca dst bt878 bttv em28xx vivi
+		saa7134 dvb-bt8xx dst_ca dst bt878 bttv bt832 mxb \
+		hexium_gemini hexium_orion em28xx pvrusb2 cpia2 vivi
 
 # frontends
-	rmmod dib3000mb dib3000mc dib3000_common nxt200x ves1x93 \
+	rmmod dib3000mb zl10353 dib3000mc dib3000_common nxt200x ves1x93 \
 			sp8870 cx22700 stv0299 ves1820 cinergyT2 ttusbdecfe \
 			tda1004x l64781 tda8083 cx24110 cx22702 stv0297 \
 			tda10021 mt352 mt312 bcm3510 s5h1420 nxt6000 \
@@ -260,9 +286,9 @@ case "$1" in
 			dvb-pll
 
 # chips and helpers
-	rmmod 	saa7127 msp3400 tvp5150 \
+	rmmod 	saa7127 msp3400 tvp5150 tda7432 tda9840 tda9875 tea6415c tea6420 \
 		saa6752hs saa6588 btcx-risc tveeprom tvaudio tda9887 tuner \
-		ir-kbd-i2c ir-common cx25840 tvmixer cs53l32a wm8775 saa711x \
+		ir-kbd-i2c ir-common cx25840 tvmixer cs53l32a wm8775 saa7115 \
 		saa7146_vv saa7146 video-buf-dvb video-buf \
 		v4l2-common v4l1-compat dvb-core videodev compat_ioctl32
 
diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh
index 44fa17759..a66989771 100755
--- a/v4l/scripts/makelinks.sh
+++ b/v4l/scripts/makelinks.sh
@@ -26,26 +26,26 @@ for x in `find include -type d | grep -v CVS` ; do
 done
 
 for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -v -f -s $PWD/$x $1/$x
+	ln -f -s $PWD/$x $1/$x
 done
 
 for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -v -f -s $PWD/$x $1/$x
+	ln -f -s $PWD/$x $1/$x
 done
 
 for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -v -f -s $PWD/$x $1/$x
+	ln -f -s $PWD/$x $1/$x
 done
 
-cd ..
+for x in `find include -type d | grep -v CVS` ; do
+	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
+done
 
-ln -v -f -s $PWD/v4l/compat.h $1/include/media/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/include/linux/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/common/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/bt8xx/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/cinergyT2/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/dvb-core/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/video/compat.h
+for x in `find drivers/media -type d | grep -v CVS` ; do
+	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
+done
+
+cd ..
 patch -p0 <<'DIFF'
 diff -u -p videodev.h
 --- linux/include/linux/videodev.h
diff --git a/v4l/scripts/prep_commit_msg.pl b/v4l/scripts/prep_commit_msg.pl
index 9c4447313..ac958667b 100755
--- a/v4l/scripts/prep_commit_msg.pl
+++ b/v4l/scripts/prep_commit_msg.pl
@@ -20,8 +20,8 @@ if ( $user eq "" ) {
 	$user="$name <$email>";
 }
 
-$first= "# Please change bellow if you are not patch author\n#\nFrom: $user";
-$out= "# At the end Signed-off-by: fields by patch author and commiter, at least\n#\nSigned-off-by: $user";
+$first= "# Please change below if you are not patch author\n#\nFrom: $user";
+$out= "# At the end Signed-off-by: fields by patch author and committer, at least\n#\nSigned-off-by: $user";
 $from= "From: $user";
 
 printf  "#Added/removed/changed files:\n%s#\n" .
@@ -29,6 +29,6 @@ printf  "#Added/removed/changed files:\n%s#\n" .
 	"# and before signed-off-by\n" .
 	"# First line should be the subject, without Subject:\n#\n\n\n" .
 	"# Now, patch author (just the main one), on a From: field\n" .
-	"# Please change bellow if the commiter is not the patch author\n#\n%s\n\n" .
+	"# Please change below if the committer is not the patch author\n#\n%s\n\n" .
 	"# Then a detailed description:\n\n\n%s",
 	$changed,$from,$out;