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

diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index 9a53d46..e9e3658 100644 (file)
--- 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