Add the gpio_keys input module to menuconfig

[openwrt.git] / package / kernel / modules / video.mk

diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
index 086bbde..5fd008b 100644 (file)
--- a/package/kernel/modules/video.mk
+++ b/package/kernel/modules/video.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 VIDEO_MENU:=Video Support
 
@@ -24,19 +23,33 @@ define KernelPackage/video-core/2.4
   AUTOLOAD:=$(call AutoLoad,60,videodev)
 endef
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
 define KernelPackage/video-core/2.6
   FILES:= \
        $(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60, \
+       v4l1-compat \
+       videodev \
        v4l2-common \
+  )
+endef
+else
+define KernelPackage/video-core/2.6
+  FILES:= \
+       $(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60, \
        v4l1-compat \
-       compat_ioctl32 \
        videodev \
+       v4l2-common \
+       compat_ioctl32 \
   )
 endef
+endif
 
 define KernelPackage/video-core/description
  Kernel modules for Video4Linux support