aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-12-06 21:23:20 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commit2c324e15f8c1c51f118455322b19bd8608b696b4 (patch)
tree52a499e8194ffdff6808b4c847f19e7c629753e9 /target/linux/brcm2708
parent1d6b080dc3b0b601a354e7b3965955389c8705cb (diff)
downloadupstream-2c324e15f8c1c51f118455322b19bd8608b696b4.tar.gz
upstream-2c324e15f8c1c51f118455322b19bd8608b696b4.tar.bz2
upstream-2c324e15f8c1c51f118455322b19bd8608b696b4.zip
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>
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/modules.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/brcm2708/modules.mk b/target/linux/brcm2708/modules.mk
index 4f6e8d8898..24488a1a02 100644
--- 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