summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/slugos.conf2
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.16.bb (renamed from packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb)15
2 files changed, 7 insertions, 10 deletions
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 929a93ad08..5a73aff7a2 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -170,7 +170,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.16-rc4-git9"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16"
# Built-in ethernet modules
PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index 1a2563cdb7..7c19cc9b1d 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -17,10 +17,10 @@ include ixp4xx-kernel.inc
# IXP4XX_PATCHES - full list of patches to apply
IXP4XX_PATCHES = ""
-IXP4XX_PATCHES += "file://patch-2.6.16-rc4-ide2;patch=1"
+IXP4XX_PATCHES += "file://patch-2.6.16-rc6-ide1;patch=1"
IXP4XX_PATCHES += "file://leds-class.patch;patch=1"
-IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1"
-IXP4XX_PATCHES += "file://10-mtdpart-redboot-fis-byteswap.patch;patch=1"
+# IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1"
+IXP4XX_PATCHES += "file://10-ixp4xx-fix-irq.patch;patch=1"
IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1"
IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1"
IXP4XX_PATCHES += "file://951-ixp4xx-leds-cpu-activity.patch;patch=1"
@@ -30,21 +30,18 @@ IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1"
IXP4XX_PATCHES += "file://50-i2c-bus-ixp4xx-hwmon.patch;patch=1"
IXP4XX_PATCHES += "file://50-hwmon-ad741x.patch;patch=1"
IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1"
-IXP4XX_PATCHES += "file://70-artop-latency.patch;patch=1"
IXP4XX_PATCHES += "file://75-dsmg600.patch;patch=1"
-IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1"
+IXP4XX_PATCHES += "file://83-nas100d-memory-fixup.patch;patch=1"
+IXP4XX_PATCHES += "file://84-nas100d-cmdline.patch;patch=1"
IXP4XX_PATCHES += "file://85-timer.patch;patch=1"
IXP4XX_PATCHES += "file://91-maclist.patch;patch=1"
IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1"
IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1"
-IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1"
IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1"
IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1"
IXP4XX_PATCHES += "file://96-pata-ixp4xx.patch;patch=1"
IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1"
IXP4XX_PATCHES += "file://96-nslu2-leds.patch;patch=1"
-IXP4XX_PATCHES += "file://97-ds101-setup.patch;patch=1"
-IXP4XX_PATCHES += "file://97-ds101-includes.patch;patch=1"
-IXP4XX_PATCHES += "file://97-ds101-pci.patch;patch=1"
+IXP4XX_PATCHES += "file://97-ds101.patch;patch=1"
IXP4XX_PATCHES += "file://97-ds101-buttons.patch;patch=1"
IXP4XX_PATCHES += "file://97-ds101-doc.patch;patch=1"