summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-02-07 15:33:45 +0000
committerRod Whitby <rod@whitby.id.au>2007-02-07 15:33:45 +0000
commit4f9805b6ac4b364e9bf75a4f39de23b6f0ee7685 (patch)
tree7c0edd1c716990bc3796ddfb6eef4659ccca5cd0
parente01cf09e9666bf12ccde929e942e98ad4a150264 (diff)
parentdf9a71e4e4b9ae35e7fb97a5591780dfb1c44045 (diff)
merge of '152f9383d2f39ad2be81ef7b6cef6e3cd553f1fe'
and '695d9d0da30616c2995fd855c846ff8a66a86363'
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.20/series1
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.20.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index f362b614b4..71c17940fc 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -12,6 +12,7 @@ squashfs/squashfs-Makefile.patch
07-remove-avila-ixdp425-setup.patch
08-avila-loft-setup.patch
09-avila-setup-pata.patch
+11-mtdpart-redboot-config-byteswap.patch
30-ixp4xx-npe-driver-0.3.1.patch
37-ixp4xx-net-driver-improve-mac-handling.patch
39-ixp4xx-net-driver-mtd-load-fw.patch
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 3af3556845..2d057799ac 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc