From be798a0be39f2667bd6bb468d48440c8ed50a07b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sat, 20 Nov 2004 19:55:29 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel into
 home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/20 20:55:12+01:00 hrw.one.pl!hrw
added license

2004/11/20 20:54:41+01:00 hrw.one.pl!hrw
fix ipsec module loading in collie kernel

BKrev: 419fa131Vo1a26ii6fm8bko4OAeonA
---
 linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509')

diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
index 3ff9d6def7..531c7385e3 100644
--- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
+++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
@@ -451,7 +451,7 @@ CONFIG_IPSEC_AUTH_HMAC_SHA1=y
 CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
 # CONFIG_IPSEC_ENC_AES is not set
-# CONFIG_IPSEC_ALG is not set
+CONFIG_IPSEC_ALG=y
 CONFIG_IPSEC_IPCOMP=y
 CONFIG_IPSEC_DEBUG=y
 
-- 
cgit v1.2.3