merge http://linuxtv.org/hg/~mkrufky/windham

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

Priority: normal

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

1 files changed, 60 insertions, 0 deletions

diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl
index bd34e7193..fdbc5eaba 100755
--- a/v4l/scripts/make_config_compat.pl
+++ b/v4l/scripts/make_config_compat.pl
@@ -102,6 +102,63 @@ sub check_bool()
 	close INDEP;
 }
 
+sub check_is_singular()
+{
+	my $file = "$kdir/include/linux/list.h";
+	my $need_compat = 1;
+
+	open INNET, "<$file" or die "File not found: $file";
+	while (<INNET>) {
+		if (m/list_is_singular/) {
+			$need_compat = 0;
+			last;
+		}
+	}
+
+	if ($need_compat) {
+		$out.= "\n#define NEED_IS_SINGULAR 1\n";
+	}
+	close INNET;
+}
+
+sub check_clamp()
+{
+	my $file = "$kdir/include/linux/kernel.h";
+	my $need_compat = 1;
+
+	open INNET, "<$file" or die "File not found: $file";
+	while (<INNET>) {
+		if (m/define\s+clamp/) {
+			$need_compat = 0;
+			last;
+		}
+	}
+
+	if ($need_compat) {
+		$out.= "\n#define NEED_CLAMP 1\n";
+	}
+	close INNET;
+}
+
+sub check_proc_create()
+{
+	my $file = "$kdir/include/linux/proc_fs.h";
+	my $need_compat = 1;
+
+	open INNET, "<$file" or die "File not found: $file";
+	while (<INNET>) {
+		if (m/proc_create/) {
+			$need_compat = 0;
+			last;
+		}
+	}
+
+	if ($need_compat) {
+		$out.= "\n#define NEED_PROC_CREATE 1\n";
+	}
+	close INNET;
+}
+
 sub check_other_dependencies()
 {
 	check_spin_lock();
@@ -109,6 +166,9 @@ sub check_other_dependencies()
 	check_snd_ctl_boolean_mono_info();
 	check_snd_pcm_rate_to_rate_bit();
 	check_bool();
+	check_is_singular();
+	check_clamp();
+	check_proc_create();
 }
 
 # Do the basic rules