summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-03-27 21:25:01 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-27 21:25:01 +0000
commit294eca554e5849ee68d9dab6ae24e6770f73d60b (patch)
tree9caa7f78f0821b2ee2b6782d20ebff73ceb3f7f6 /packages/linux
parentd3c722af15628e53d2c7d929d9c6037f96215251 (diff)
parentbd60339fa8177e0eb703dfd8cf2a3df91e33baa4 (diff)
merge of 4ac478c0ff58cc879efa4b3954a917e2377a16a8
and cc1ec8935114858197f3be2f7c969db8f38fe944
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch21
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.16.bb5
2 files changed, 24 insertions, 2 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch b/packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch
new file mode 100644
index 0000000000..b73d219708
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch
@@ -0,0 +1,21 @@
+*** linux-2.6.16/arch/arm/mm/copypage-xscale.c- Mon Mar 27 19:10:25 2006
+--- linux-2.6.16/arch/arm/mm/copypage-xscale.c Sun Mar 26 19:32:53 2006
+***************
+*** 15,20 ****
+--- 15,21 ----
+ */
+ #include <linux/init.h>
+ #include <linux/mm.h>
++ #include <linux/module.h>
+
+ #include <asm/page.h>
+ #include <asm/pgtable.h>
+***************
+*** 129,131 ****
+--- 130,135 ----
+ .cpu_clear_user_page = xscale_mc_clear_user_page,
+ .cpu_copy_user_page = xscale_mc_copy_user_page,
+ };
++
++ EXPORT_SYMBOL(xscale_mc_clear_user_page);
++ EXPORT_SYMBOL(xscale_mc_copy_user_page);
diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index 7c19cc9b1d..ba9a2522f7 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -8,7 +8,7 @@ PR_CONFIG = "1"
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r0.${PR_CONFIG}"
+PR = "r1.${PR_CONFIG}"
include ixp4xx-kernel.inc
@@ -17,8 +17,9 @@ include ixp4xx-kernel.inc
# IXP4XX_PATCHES - full list of patches to apply
IXP4XX_PATCHES = ""
-IXP4XX_PATCHES += "file://patch-2.6.16-rc6-ide1;patch=1"
+IXP4XX_PATCHES += "file://patch-2.6.16-rc4-ide2;patch=1"
IXP4XX_PATCHES += "file://leds-class.patch;patch=1"
+IXP4XX_PATCHES += "file://copypage-xscale.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"