From 756559188b00ae732a83f257c46c9b2a5d60ae47 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Wed, 2 Jan 2008 18:58:27 +0000 Subject: [PATCH] Enable IP_ADVANCED_ROUTER svn path=/dists/trunk/linux-2.6/; revision=10016 --- debian/changelog | 2 ++ debian/config/arm/config.iop32x | 4 ---- debian/config/arm/config.ixp4xx | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa769080e..749960e98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ linux-2.6 (2.6.24~rc6-1~experimental.1) UNRELEASED; urgency=low #456416). * [arm/iop32x] Enable BSD_PROCESS_ACCT and POSIX_MQUEUE (closes: #455892). * [mips] Disable AdvanSys SCSI since it doesn't compile. + * [arm/ixp4xx] Enable IP_ADVANCED_ROUTER, requested by Oliver Urbann. + * [arm/iop32x] Enable IP_ADVANCED_ROUTER. [ dann frazier ] * [ia64]: Enable BLK_CPQ_DA diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x index 9e43fc0f9..6a5b32525 100644 --- a/debian/config/arm/config.iop32x +++ b/debian/config/arm/config.iop32x @@ -189,10 +189,6 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=m CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx index 11d095f51..d2d63752a 100644 --- a/debian/config/arm/config.ixp4xx +++ b/debian/config/arm/config.ixp4xx @@ -190,10 +190,6 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=m CONFIG_NET_KEY=m CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y