brcm2708: prepare kmod-video-bcm2835 for 4.14

Since kernel 4.12, this driver appeared in staging. The rpi-4.14.y
kernel tree uses these as well.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

diff --git a/target/linux/brcm2708/modules.mk b/target/linux/brcm2708/modules.mk
index 4f6e8d88988746f8d766fd0a2915a7f822fe4f90..24488a1a026b6d542676e04a373c42d7a3a05d55 100644 (file)
--- a/target/linux/brcm2708/modules.mk
+++ b/target/linux/brcm2708/modules.mk
@@ -629,9 +629,11 @@ $(eval $(call KernelPackage,i2c-bcm2835))
 define KernelPackage/video-bcm2835
   TITLE:=Broadcom BCM2835 camera interface driver
   KCONFIG:= \
-       CONFIG_VIDEO_BCM2835=y \
+       CONFIG_VIDEO_BCM2835$(if $(CONFIG_LINUX_4_9),=y) \
        CONFIG_VIDEO_BCM2835_MMAL
-  FILES:= $(LINUX_DIR)/drivers/media/platform/bcm2835/bcm2835-v4l2.ko
+  FILES:= \
+       $(LINUX_DIR)/drivers/media/platform/bcm2835/bcm2835-v4l2.ko@lt4.12 \
+       $(LINUX_DIR)/drivers/staging/vc04_services/bcm2835-camera/bcm2835-v4l2.ko@ge4.12
   AUTOLOAD:=$(call AutoLoad,65,bcm2835-v4l2)
   $(call AddDepends/video,@TARGET_brcm2708 +kmod-video-videobuf2)
 endef