merge: http://kernellabs.com/hg/~mkrufky/saa7164

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 21 insertions, 1 deletions

diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index cfe53a636..8e0504b61 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -585,6 +585,7 @@ EOF
 
 open_kconfig('../linux', '../linux/drivers/media/Kconfig');
 open_kconfig('.', './Kconfig.sound');
+open_kconfig('.', './Kconfig.staging');
 close OUT;
 
 # These options should default to off
@@ -592,6 +593,9 @@ disable_config('DVB_AV7110_FIRMWARE');
 disable_config('DVB_CINERGYT2_TUNING');
 disable_config('VIDEO_HELPER_CHIPS_AUTO');
 disable_config('VIDEO_FIXED_MINOR_RANGES');
+disable_config('STAGING');
+disable_config('STAGING_BROKEN');
+$intopt { "DVB_MAX_ADAPTERS" } = 8;
 
 # Check dependencies
 my %newconfig = checkdeps();
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 35ab7dddf..b49f960d1 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 use FileHandle;
+use File::Find;
 
 my %instdir = ();
 
@@ -185,11 +186,23 @@ sub removeubuntu()
 	print OUT " fi\n";
 }
 
+sub parse_dir()
+{
+	my $file = $File::Find::name;
+
+	return if (!($file =~ /Makefile$/));
+	open_makefile($file);
+}
+
+##############################################################################
+
 getobsolete();
 
 open OUT, '>Makefile.media' or die 'Unable to write Makefile.media';
 open_makefile('../linux/drivers/media/Makefile');
 
+find({wanted => \&parse_dir, no_chdir => 1}, '../linux/drivers/staging');
+
 # Creating Install rule
 print OUT "media-install::\n";
 
@@ -234,9 +247,12 @@ while ( my ($dir, $files) = each(%instdir) ) {
 	print OUT " rm \$(DESTDIR)\$(KDIR26)/$dir/\$\$i.gz; fi; done; echo;\n\n";
 }
 
+my $mediadeps = join(" \\\n", map("\t../linux/drivers/media/$_/Makefile", keys %instdir));
+$mediadeps =~ s,\.\./linux/drivers/media/\.\.,..,g;
+
 # Print dependencies of Makefile.media
 print OUT "Makefile.media: ../linux/drivers/media/Makefile \\\n";
 print OUT "\tobsolete.txt \\\n";
-print OUT join(" \\\n", map("\t../linux/drivers/media/$_/Makefile", keys %instdir));
+print OUT $mediadeps;
 print OUT "\n";
 close OUT;