summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2004-11-20 19:55:29 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2004-11-20 19:55:29 +0000
commitbe798a0be39f2667bd6bb468d48440c8ed50a07b (patch)
tree7958513087c02c3b3dfca74a5890385b0e10843d /linux
parentae6f56944f8801d549cc25afd0246f7d30592834 (diff)
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
Diffstat (limited to 'linux')
-rw-r--r--linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie2
-rw-r--r--linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe2
2 files changed, 2 insertions, 2 deletions
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
diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index ecd4628ccf..695ae811a5 100644
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -5,7 +5,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20030509"
-PR = "r11"
+PR = "r12"
DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"