diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-24 17:03:56 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-24 17:03:56 +0000 |
| commit | f313735f8cb05c968c896a2745d07098a8d04791 (patch) | |
| tree | b5bcd92b254263cb48e09f896479111db70a4787 /linux/montavista-sa-2.4.17-mvl21 | |
| parent | b765505fce4ec3be9238e83cd6debff2d8fed6f7 (diff) | |
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
Diffstat (limited to 'linux/montavista-sa-2.4.17-mvl21')
| -rw-r--r-- | linux/montavista-sa-2.4.17-mvl21/defconfig-beagle | 4 |
1 files 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 |