diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 7 | ||||
| -rw-r--r-- | v4l/compat.h | 8 | ||||
| -rwxr-xr-x | v4l/scripts/hg-pull-req.pl | 6 | ||||
| -rw-r--r-- | v4l/versions.txt | 6 |
4 files changed, 19 insertions, 8 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index f96873227..52ca3ec54 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -159,9 +159,12 @@ CC += -I$(obj) ifeq ($(VERSION).$(PATCHLEVEL),2.6) CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS) -I$(SUBDIRS)/ - # Needed for kernel 2.6.24 or upper + # Needed for kernel 2.6.24 or up KBUILD_CPPFLAGS := -I$(SUBDIRS)/../linux/include $(KBUILD_CPPFLAGS) -I$(SUBDIRS)/ + # Needed for kernel 2.6.29 or up + LINUXINCLUDE := -I$(SUBDIRS)/../linux/include $(LINUXINCLUDE) -I$(SUBDIRS)/ + MYCFLAGS := else MYCFLAGS := CFLAGS="-I../linux/include -D__KERNEL__ -I$(KDIR)/include -DEXPORT_SYMTAB" @@ -275,7 +278,7 @@ clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ - config-compat.h Module.symvers + config-compat.h Module.symvers Module.markers modules.order make -C firmware clean distclean:: clean diff --git a/v4l/compat.h b/v4l/compat.h index 186493d7f..b00e8eaf3 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -412,5 +412,13 @@ static inline int usb_endpoint_type(const struct usb_endpoint_descriptor *epd) 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/versions.txt b/v4l/versions.txt index 722a9283a..11b6004a6 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -4,9 +4,11 @@ [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 |