From 70898af7ba22ddd291a24ac00be1f9b1431bbfc2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 20 Mar 2012 20:38:21 +0100
Subject: more allconfig fixes

---
 mk/modules.mk           | 11 +++++++----
 package/ffmpeg/Makefile |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mk/modules.mk b/mk/modules.mk
index 3193afc67..767821fe7 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -171,15 +171,15 @@ SLHC:=drivers/net/slip/slhc
 PPP:=drivers/net/ppp/ppp_generic
 PPP_ASYNC:=drivers/net/ppp/ppp_async
 MPPE:=drivers/net/ppp/ppp_mppe
-PPPOE:=drivers/net/ppp/pppox
-PPPOX:=drivers/net/ppp/pppoe
+PPPOE:=drivers/net/ppp/pppoe
+PPPOX:=drivers/net/ppp/pppox
 else
 SLHC:=drivers/net/slhc
 PPP:=drivers/net/ppp_generic
 PPP_ASYNC:=drivers/net/ppp_async
 MPPE:=drivers/net/ppp_mppe
-PPPOE:=drivers/net/pppox
-PPPOX:=drivers/net/pppoe
+PPPOE:=drivers/net/pppoe
+PPPOX:=drivers/net/pppox
 endif
 
 $(eval $(call KMOD_template,PPP,ppp,\
@@ -456,6 +456,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IRC,nf-conntrack-irc,\
 ,55))
 
 $(eval $(call KMOD_template,NF_CONNTRACK_NETBIOS_NS,nf-conntrack-netbios-ns,\
+	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_broadcast \
 	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_netbios_ns \
 ,55))
 
@@ -601,6 +602,7 @@ $(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\
 #
 
 $(eval $(call KMOD_template,NF_CONNTRACK_IPV6,nf-conntrack-ipv6,\
+	$(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_defrag_ipv6 \
 	$(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_conntrack_ipv6 \
 ,50))
 
@@ -1177,6 +1179,7 @@ $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
 	$(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
 	$(MODULES_DIR)/kernel/drivers/media/video/videobuf2-core \
+	$(MODULES_DIR)/kernel/drivers/media/video/videobuf2-vmalloc \
 ,65))
 
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index c4ecdc037..2715a6570 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -22,10 +22,13 @@ PKGSS_FFPLAY:=		libsdl libpthread libffmpeg
 PKGSB_FFPLAY:=		sdl
 PKGSD_FFMPEG:=		ffmpeg video converter
 PKGSC_FFMPEG:=		multimedia
+PKGSS_FFMPEG:=		libffmpeg
 PKGSD_FFSERVER:=	streaming server
 PKGSC_FFSERVER:=	multimedia
+PKGSS_FFSERVER:=	libffmpeg
 PKGSD_FFPROBE:=		simple multimedia stream analyzer
 PKGSC_FFPROBE:=		multimedia
+PKGSS_FFPROBE:=		libffmpeg
 
 PKG_FLAVOURS_LIBFFMPEG:=	WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
 PKG_FLAVOURS_LIBFFMPEG+=	WITH_XVID WITH_VORBIS
-- 
cgit v1.2.3