Update config for renaming and splitting of various symbols
CONFIG_IP6_NF_MATCH_HL was replaced by CONFIG_NETFILTER_XT_MATCH_HL (years ago!) but kept around for compatibility. Set the latter directly. Similarly for CONFIG_IP6_NF_TARGET_HL and CONFIG_NETFILTER_XT_TARGET_HL (which we already explicitly set). CONFIG_NETPRIO_CGROUP was renamed to CONFIG_CGROUP_NET_PRIO with no such care for compatibility. CONFIG_VIDEO_EM28XX was split with some code now dependent on CONFIG_VIDEO_EM28XX_V4L2 which doesn't default to y. svn path=/dists/trunk/linux/; revision=21129
This commit is contained in:
parent
80205fe93b
commit
4d8500fb95
|
@ -1669,6 +1669,7 @@ CONFIG_DVB_USB_RTL28XXU=m
|
|||
## file: drivers/media/usb/em28xx/Kconfig
|
||||
##
|
||||
CONFIG_VIDEO_EM28XX=m
|
||||
CONFIG_VIDEO_EM28XX_V4L2=m
|
||||
CONFIG_VIDEO_EM28XX_ALSA=m
|
||||
CONFIG_VIDEO_EM28XX_DVB=m
|
||||
CONFIG_VIDEO_EM28XX_RC=y
|
||||
|
@ -4842,7 +4843,7 @@ CONFIG_NETFILTER=y
|
|||
# CONFIG_NETFILTER_DEBUG is not set
|
||||
CONFIG_NETFILTER_ADVANCED=y
|
||||
CONFIG_BRIDGE_NETFILTER=y
|
||||
CONFIG_NETPRIO_CGROUP=m
|
||||
CONFIG_CGROUP_NET_PRIO=m
|
||||
CONFIG_BPF_JIT=y
|
||||
CONFIG_NET_PKTGEN=m
|
||||
# CONFIG_NET_TCPPROBE is not set
|
||||
|
@ -5118,12 +5119,10 @@ CONFIG_IP6_NF_MATCH_AH=m
|
|||
CONFIG_IP6_NF_MATCH_EUI64=m
|
||||
CONFIG_IP6_NF_MATCH_FRAG=m
|
||||
CONFIG_IP6_NF_MATCH_OPTS=m
|
||||
CONFIG_IP6_NF_MATCH_HL=m
|
||||
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
|
||||
CONFIG_IP6_NF_MATCH_MH=m
|
||||
CONFIG_IP6_NF_MATCH_RPFILTER=m
|
||||
CONFIG_IP6_NF_MATCH_RT=m
|
||||
CONFIG_IP6_NF_TARGET_HL=m
|
||||
CONFIG_IP6_NF_FILTER=m
|
||||
CONFIG_IP6_NF_TARGET_REJECT=m
|
||||
CONFIG_IP6_NF_TARGET_SYNPROXY=m
|
||||
|
@ -5261,6 +5260,7 @@ CONFIG_NETFILTER_XT_MATCH_ECN=m
|
|||
CONFIG_NETFILTER_XT_MATCH_ESP=m
|
||||
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
|
||||
CONFIG_NETFILTER_XT_MATCH_HELPER=m
|
||||
CONFIG_NETFILTER_XT_MATCH_HL=m
|
||||
CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
|
||||
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=m
|
||||
|
|
Loading…
Reference in New Issue