From: Phil Blundell Date: Sat, 20 Nov 2004 20:00:17 +0000 (+0000) Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel X-Git-Tag: Release-2010-05/1~16072 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ccbd9ccd6de9f3b04f06eb0e5a7bf4e798e80f2;p=openembedded.git Merge bk://openembedded@openembedded.bkbits.net/packages-devel into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/20 19:59:14+00:00 nexus.co.uk!pb enable CONFIG_IPSEC_ALG in openzaurus-pxa kernels BKrev: 419fa251Lhgf_O62UlUyCrKr2pM7Rg --- diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi index 95b107bc73..0c350e9eed 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi @@ -461,7 +461,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 diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky index 7db34b6936..8815477144 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky @@ -461,7 +461,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 diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd index 0e8c359799..9999298bd6 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd @@ -461,7 +461,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