summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-02-08 23:36:48 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-08 23:36:48 +0000
commit8bf7fc815aa4f798990d3a117e902f4cf9b17380 (patch)
tree29b949959a2128f8693ad0d024a9da5bc3f7cb97
parent8689b67e27766a6ff5efc3629e987118be5b6df2 (diff)
linux-oz-2.6: Add kexec patch and correct a poodle build failure.
-rw-r--r--packages/linux/linux-openzaurus-2.6.15/defconfig-poodle2
-rw-r--r--packages/linux/linux-openzaurus_2.6.15.bb3
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
index 7fdc6fadf3..325cba20f1 100644
--- a/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
@@ -844,7 +844,7 @@ CONFIG_KEYBOARD_LOCOMO=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_CORGI=y
+# CONFIG_TOUCHSCREEN_CORGI is not set
# CONFIG_TOUCHSCREEN_GUNZE is not set
# CONFIG_TOUCHSCREEN_ELO is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb
index fac29e5c61..b42f101f50 100644
--- a/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r4"
+PR = "r5"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -74,6 +74,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \
${RPSRC}/pm_changes-r0.patch;patch=1 \
${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
+ ${DOSRC}/kexec-arm-r0.patch \
file://add-oz-release-string.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \