From d5c04e3ad97347a3b62795daac379028f2ade352 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 6 Jan 2009 01:39:15 -0200
Subject: fix compile with Fedora 10 kernel

From: Nicola Soranzo <nsoranzo@tiscali.it>

Fix compile error about ioremap_nocache with kernel 2.6.27.9 shipped by Fedora
10.

Signed-off-by: Nicola Soranzo <nsoranzo@tiscali.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 v4l/scripts/make_config_compat.pl | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'v4l/scripts')

diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl
index dc6653b0d..d24b5f718 100755
--- a/v4l/scripts/make_config_compat.pl
+++ b/v4l/scripts/make_config_compat.pl
@@ -235,6 +235,25 @@ sub check_usb_endpoint_type()
 	close INNET;
 }
 
+sub check_pci_ioremap_bar()
+{
+	my $file = "$kdir/include/linux/pci.h";
+	my $need_compat = 1;
+
+	open INNET, "<$file" or die "File not found: $file";
+	while (<INNET>) {
+		if (m/pci_ioremap_bar/) {
+			$need_compat = 0;
+			last;
+		}
+	}
+
+	if ($need_compat) {
+		$out.= "\n#define NEED_PCI_IOREMAP_BAR 1\n";
+	}
+	close INNET;
+}
+
 sub check_other_dependencies()
 {
 	check_spin_lock();
@@ -249,6 +268,7 @@ sub check_other_dependencies()
 	check_algo_control();
 	check_net_dev();
 	check_usb_endpoint_type();
+	check_pci_ioremap_bar();
 }
 
 # Do the basic rules
-- 
cgit v1.2.3


From f0d64aedf578588f9671748feabd4ea84f23f29b Mon Sep 17 00:00:00 2001
From: Trent Piepho <xyzzy@speakeasy.org>
Date: Mon, 12 Jan 2009 09:09:08 -0800
Subject: scripts: Fix pull request script

From: Trent Piepho <xyzzy@speakeasy.org>

Changeset 9220:ae5f57c85068 from Tobias Lorenz <tobias.lorenz@gmx.net>,
broke the pull request script.  Given the description of the changeset in
its entirety is "merges from main", and that the other (totally unrelated)
change introduced has already been reverted, I can only conclude that the
changeset was a mistake from someone new to Hg.

Priority: normal

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
CC: Tobias Lorenz <tobias.lorenz@gmx.net>
---
 v4l/scripts/hg-pull-req.pl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'v4l/scripts')

diff --git a/v4l/scripts/hg-pull-req.pl b/v4l/scripts/hg-pull-req.pl
index 09f0b513f..66de967eb 100755
--- a/v4l/scripts/hg-pull-req.pl
+++ b/v4l/scripts/hg-pull-req.pl
@@ -81,11 +81,9 @@ if (`hg outgoing $from_repo` !~ /^no changes found$/m ||
 
 open IN, "hg outgoing -M $to_repo |";
 while(<IN>) {
-    if(/^changeset:\s+\d+:([[:xdigit:]]+)$/) {
+    if(/^changeset:\s+\d+:([[:xdigit:]]{12})$/) {
 	push @changesets, $1;
-    } elsif(/^description:$/) {
-	$_ = <IN>;
-	/^(\S.*)$/;
+    } elsif(/^summary:\s+(\S.*)$/) {
 	if ($1 =~ /^merge:/) {
 	    # Skip merge changesets
 	    pop @changesets;
-- 
cgit v1.2.3