summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-06-29 03:09:23 +0000
committerRod Whitby <rod@whitby.id.au>2007-06-29 03:09:23 +0000
commit72288b07cf3b8125dd59bb6eaed128b8a2878757 (patch)
tree1b754621acf1af8264175609fbaee960f6ba8113
parent62302d90c75a00511e312ed05a420f1c38d21b24 (diff)
ixp4xx-kernel: Updated to 2.6.21.5 for stable version
-rw-r--r--conf/distro/include/slugos.inc4
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.5.bb (renamed from packages/linux/ixp4xx-kernel_2.6.21.1.bb)2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 46ba2fcf74..c2970d2b99 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
@@ -144,4 +144,4 @@ IGNORE_STRIP_ERRORS = ""
# Remove this once the madwifi-ng stuff seems to stabilize once again.
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
-PREFERRED_VERSION_linux-libc-headers = "2.6.18" \ No newline at end of file
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.1.bb b/packages/linux/ixp4xx-kernel_2.6.21.5.bb
index 9fe53cad59..8ff440b28b 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.1.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.5.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "877"
+IXP4XX_KERNEL_SVN_REV = "879"
#
# The directory containing the patches to be applied is
# specified below