diff options
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/hg-pull-req.pl | 6 | ||||
| -rwxr-xr-x | v4l/scripts/make_config_compat.pl | 20 |
2 files changed, 22 insertions, 4 deletions
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; 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 |