* debian/changelog: Update.

* debian/config: Always enable IPV6.

svn path=/dists/trunk/linux/; revision=19495
This commit is contained in:
Bastian Blank 2012-11-11 11:51:12 +00:00
parent 2ef4ec7940
commit e0ca22e6db
6 changed files with 2 additions and 21 deletions

1
debian/changelog vendored
View File

@ -21,6 +21,7 @@ linux (3.6.6-1~experimental.1) UNRELEASED; urgency=low
[ Bastian Blank ]
* [sparc] Remove IP_PNP, IP_PNP_RARP, NET_IPGRE and ARPD overrides.
* Enable IPv6 globally.
-- Uwe Kleine-König <uwe@kleine-koenig.org> Mon, 29 Oct 2012 15:50:12 +0100

View File

@ -4251,7 +4251,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=m
CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y

View File

@ -1639,11 +1639,6 @@ CONFIG_DECNET=m
##
CONFIG_DECNET_NF_GRABULATOR=m
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=y
##
## file: net/ipx/Kconfig
##

View File

@ -899,11 +899,6 @@ CONFIG_DECNET_ROUTER=y
##
CONFIG_DECNET_NF_GRABULATOR=m
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=y
##
## file: net/ipx/Kconfig
##

View File

@ -164,11 +164,6 @@ CONFIG_SPARSEMEM_MANUAL=y
##
# CONFIG_DECNET is not set
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=y
##
## file: net/ipx/Kconfig
##

View File

@ -566,11 +566,6 @@ CONFIG_SPARSEMEM_MANUAL=y
CONFIG_DECNET=m
CONFIG_DECNET_ROUTER=y
##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=y
##
## file: net/ipx/Kconfig
##