From f313735f8cb05c968c896a2745d07098a8d04791 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 24 Aug 2004 17:03:56 +0000 Subject: [PATCH] Merge bk://openembedded@openembedded.bkbits.net/packages into allanon.vanille.de:/usr/local/projects/packages 2004/08/24 19:03:21+02:00 vanille.de!mickeyl Merge 2004/08/24 19:01:38+02:00 vanille.de!mickeyl defconfig changes BKrev: 412b74fcllAFqHSwPMBhv8GkeHNN4A --- linux/montavista-sa-2.4.17-mvl21/defconfig-beagle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle index 9a53d46eb2..e9e3658ab7 100644 --- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle +++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle @@ -328,8 +328,8 @@ CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m # CONFIG_ARPD is not set # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set -- 2.39.5