ixp4xx-kernel: Updated to 2.6.21.1

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 4c7dd42..8679300 100644 (file)
--- 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"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"

diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
index 1bf8a63..15b4ba5 100644 (file)
--- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
@@ -1164,7 +1164,6 @@ CONFIG_I2C_IXP4XX=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_I2C_SIS5595 is not set

diff --git a/packages/linux/ixp4xx-kernel_2.6.21.bb b/packages/linux/ixp4xx-kernel_2.6.21.1.bb
similarity index 95%
rename from packages/linux/ixp4xx-kernel_2.6.21.bb
rename to packages/linux/ixp4xx-kernel_2.6.21.1.bb
index 5995194..8025465 100644 (file)
--- a/packages/linux/ixp4xx-kernel_2.6.21.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.1.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 = "839"
+IXP4XX_KERNEL_SVN_REV = "847"
 #
 # The directory containing the patches to be applied is
 # specified below