diff options
| author | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
| commit | c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b (patch) | |
| tree | 4ad3708cf7dc5ff01b2e657e314883ab2330c658 /v4l | |
| parent | 708ba0701edccea0b0fc2b0ea9303337a85ff05c (diff) | |
| parent | b0fc8c78cb5fd9394d8d4ff3198bdc9390b96001 (diff) | |
| download | mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.gz mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.bz2 | |
Merge from master v4l-dvb repo
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 18 | ||||
| -rwxr-xr-x | v4l/scripts/hg-pull-req.pl | 6 | ||||
| -rwxr-xr-x | v4l/scripts/make_config_compat.pl | 20 | ||||
| -rw-r--r-- | v4l/versions.txt | 8 |
4 files changed, 42 insertions, 10 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 3b04c91f6..b00e8eaf3 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -270,10 +270,6 @@ static inline int dummy_algo_control(struct i2c_adapter *adapter, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28) #define snd_BUG_ON(cond) WARN((cond), "BUG? (%s)\n", __stringify(cond)) - -#define pci_ioremap_bar(pci, a) \ - ioremap_nocache(pci_resource_start(pci, a), \ - pci_resource_len(pci, a)) #endif #ifndef PCI_DEVICE_ID_MARVELL_88ALP01_CCIC @@ -410,5 +406,19 @@ static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd) #define netdev_priv(dev) ((dev)->priv) #endif +#ifdef NEED_PCI_IOREMAP_BAR +#define pci_ioremap_bar(pdev, bar) \ + ioremap_nocache(pci_resource_start(pdev, bar), \ + pci_resource_len(pdev, bar)) +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) +#define poll_schedule(pwq, task) \ + do { \ + set_current_state(task); \ + schedule(); \ + set_current_state(TASK_RUNNING); \ + } while (0) +#endif #endif 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 diff --git a/v4l/versions.txt b/v4l/versions.txt index 6d547a509..11b6004a6 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -4,11 +4,15 @@ [2.6.28] USB_STV06XX -[2.6.26] -# Needs camera.h +[2.6.27] +# Needs struct pxa_dma_desc VIDEO_PXA27x + +[2.6.26] # Requires struct i2c_device_id VIDEO_TVP514X +# requires id_table and new i2c stuff +RADIO_TEA5764 [2.6.25] # Requires gpiolib |