diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 3 | ||||
| -rw-r--r-- | v4l/compat.h | 23 | ||||
| -rw-r--r-- | v4l/versions.txt | 4 |
3 files changed, 28 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 7674abd98..b07b592b1 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -102,6 +102,8 @@ EXTRA_CFLAGS += -g EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL) +EXTRA_CFLAGS += -include $(obj)/config-compat.h + ################################################# # Kernel 2.4/2.6 specific rules @@ -241,6 +243,7 @@ config-compat.h:: .myconfig -e 'while(<>) {' \ -e ' next unless /^(\S+)\s*:= (\S+)$$/;' \ -e ' print "#undef $$1\n";' \ + -e ' print "#undef $$1_MODULE\n";' \ -e ' if($$2 eq "n") { next; }' \ -e ' elsif($$2 eq "m") { print "#define $$1_MODULE 1\n"; }' \ -e ' elsif($$2 eq "y") { print "#define $$1 1\n"; }' \ diff --git a/v4l/compat.h b/v4l/compat.h index a4f66eee2..6ba49e825 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -10,7 +10,6 @@ #include <linux/version.h> #include <linux/utsname.h> #include <linux/sched.h> -#include "config-compat.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) # define minor(x) MINOR(x) @@ -268,6 +267,10 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) # define input_allocate_device() kzalloc(sizeof(struct input_dev),GFP_KERNEL); # define input_free_device(input_dev) kfree(input_dev) +# ifdef _INPUT_H /* input.h must be included _before_ compat.h for this to work */ + /* input_register_device() was changed to return an error code in 2.6.15 */ +# define input_register_device(x) (input_register_device(x), 0) +# endif #endif #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) @@ -288,6 +291,24 @@ schedule_timeout_interruptible(signed long timeout) } #endif +/* New 4GB DMA zone was added in 2.6.15-rc2 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) +# define __GFP_DMA32 __GFP_DMA +#endif + +/* setup_timer() helper added 10/31/05, 2.6.15-rc1 */ +/* Need linux/timer.h to be included for struct timer_list */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) && defined(_LINUX_TIMER_H) +static inline void setup_timer(struct timer_list * timer, + void (*function)(unsigned long), + unsigned long data) +{ + timer->function = function; + timer->data = data; + init_timer(timer); +} +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #define IRQF_SHARED SA_SHIRQ #define IRQF_DISABLED SA_INTERRUPT diff --git a/v4l/versions.txt b/v4l/versions.txt index 3d1a14a7e..e30a74e85 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -111,6 +111,9 @@ DVB_USB_DIBUSB_MB_FAULTY DVB_USB_DIBUSB_MC DVB_USB_UMT_010 DVB_USB_CXUSB +DVB_USB_M920X +DVB_USB_GL861 +DVB_USB_AU6610 DVB_USB_DIGITV DVB_USB_VP7045 DVB_USB_VP702X @@ -162,7 +165,6 @@ DVB_TUNER_MT2060 DVB_TUNER_LGH06XF VIDEO_SAA7146 VIDEO_SAA7146_VV -VIDEO_VIDEOBUF VIDEO_TUNER VIDEO_BUF VIDEO_BUF_DVB |