merge from main

From: Patrick Boettcher <pb@linuxtv.org>

merge from main

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>

5 files changed, 10 insertions, 9 deletions

diff --git a/v4l/Makefile.kernel b/v4l/Makefile.kernel
index b01c17f55..bbcfdc6d3 100644
--- a/v4l/Makefile.kernel
+++ b/v4l/Makefile.kernel
@@ -1,8 +1,8 @@
-# This Makefile is used to build sources that are part of the kernel tree. 
+# This Makefile is used to build sources that are part of the kernel tree.
 # What we want are the various programs used by the kconfig system.  We can't
 # just directly call the top-level kernel Makefile, as it doesn't provide
 # targets to only build the kconfig system.  It provides targets to build
-# the kconfig system *and then configure the kernel*.  
+# the kconfig system *and then configure the kernel*.
 
 # What we do is include the top-level kernel Makefile here, to get all the
 # variables and rules it defines, and then add our own targets to just build
@@ -32,7 +32,7 @@ v4l-qconf: scripts_basic
 # Used by the qconfig target
 v4l-gconf: scripts_basic
 	$(MAKE) $(build)=scripts/kconfig gconf-target=1 scripts/kconfig/gconf
-	
+
 # Used by the menuconfig target, also needs lxdialog
 v4l-mconf: scripts_basic
 	$(MAKE) $(build)=scripts/kconfig scripts/kconfig/mconf
diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl
index 3f8b4b0ba..fdc9720c6 100755
--- a/v4l/scripts/hghead.pl
+++ b/v4l/scripts/hghead.pl
@@ -110,7 +110,7 @@ while ($line = <IN>) {
 		next;
 	}
 
-		
+
 	if ($line =~ m/^Acked-by:.*/) {
 		$signed="$signed$line";
 		next;
diff --git a/v4l/scripts/make_myconfig.pl b/v4l/scripts/make_myconfig.pl
index 7323f419c..0bde6f6c0 100755
--- a/v4l/scripts/make_myconfig.pl
+++ b/v4l/scripts/make_myconfig.pl
@@ -15,7 +15,7 @@ open IN,".config";
 while (<IN>) {
 	if (m/\s*(\w+)=\s*(\S*)/) {
 #printf "%s=%s\n",$1,$2;
-		$config { $1 } = $2;		
+		$config { $1 } = $2;
 	}
 }
 close IN;
diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh
index 03fd48849..187145822 100755
--- a/v4l/scripts/makelinks.sh
+++ b/v4l/scripts/makelinks.sh
@@ -5,7 +5,7 @@ if test -z $1 || ! test -d $1 ; then
 	echo
 	echo "  usage: $0 <path_to_kernel_to_patch>"
 	echo
-	exit 
+	exit
 fi
 
 echo "patching $1..."
@@ -14,15 +14,15 @@ cd linux
 PWD=`pwd`
 
 for x in `find drivers -type d | grep -v CVS` ; do
-	mkdir -p -v $1/$x 
+	mkdir -p -v $1/$x
 done
 
 for x in `find Documentation -type d | grep -v CVS` ; do
-	mkdir -p -v $1/$x 
+	mkdir -p -v $1/$x
 done
 
 for x in `find include -type d | grep -v CVS` ; do
-	mkdir -p -v $1/$x 
+	mkdir -p -v $1/$x
 done
 
 for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 5ce118813..80e96096c 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -152,6 +152,7 @@ DVB_BCM3510
 DVB_LGDT330X
 DVB_LNBP21
 DVB_ISL6421
+DVB_TUNER_MT2060
 VIDEO_SAA7146
 VIDEO_SAA7146_VV
 VIDEO_VIDEOBUF