From 1f28b60566ae6df05bee4dc8b2c5517fadaee79a Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Fri, 10 Sep 2004 08:46:47 +0000 Subject: - fix 2.4 kernel builds. --- linux/drivers/media/video/msp3400-driver.c | 1 + linux/drivers/media/video/msp3400.c | 1 + linux/include/media/ir-common.h | 1 + v4l/Make.config | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 11315f10a..44287f2bf 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -59,6 +59,7 @@ #include #endif #include "msp3400.h" +#include "compat.h" /* insmod parameters */ static int debug = 0; /* debug output */ diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index 11315f10a..44287f2bf 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -59,6 +59,7 @@ #include #endif #include "msp3400.h" +#include "compat.h" /* insmod parameters */ static int debug = 0; /* debug output */ diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 4c0e15ad0..bae01b630 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -25,6 +25,7 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) /* some keys from 2.6.x which are not (yet?) in 2.4.x */ # define KEY_PLAY 207 +# define KEY_PRINT 210 # define KEY_SEARCH 217 # define KEY_SELECT 0x161 # define KEY_GOTO 0x162 diff --git a/v4l/Make.config b/v4l/Make.config index 4d2bd32c8..0464b1127 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -2,8 +2,11 @@ MDIR := v4l2 snap := video4linux CONFIG_VIDEO_BTTV := m -CONFIG_VIDEO_CX88 := m CONFIG_VIDEO_SAA7134 := m CONFIG_VIDEO_IR := m CONFIG_VIDEO_TUNER := m CONFIG_VIDEO_TVAUDIO := m + +ifeq ($(VERSION).$(PATCHLEVEL),2.6) + CONFIG_VIDEO_CX88 := m +endif -- cgit v1.2.3