summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-02-09 15:04:36 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-02-10 07:43:06 +0100
commitfe3c4cdc42e81d36146a90f44c4d4ab059ee0dbc (patch)
tree4c0193aa4292628267ae2cfcc956dc8992e00138 /recipes
parentaefc8c29f6f6014c20c86593cf15ffd69c28b1a8 (diff)
linux-openmoko-2.6.32: upgrade to 2.6.32.8, drop applied patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch42
-rw-r--r--recipes/linux/linux-openmoko-2.6.32_git.bb8
2 files changed, 3 insertions, 47 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch b/recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch
deleted file mode 100644
index 52f6e6b6b3..0000000000
--- a/recipes/linux/linux-openmoko-2.6.32/fix.compilation.if.no.GENERIC_TIME.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From patchwork Sat Jan 30 15:56:13 2010
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [-stable,2.6.32.7] clocksource: fix compilation if no GENERIC_TIME
-Date: Sat, 30 Jan 2010 15:56:13 -0000
-From: Aaro Koskinen <aaro.koskinen@iki.fi>
-X-Patchwork-Id: 75896
-
-See http://patchwork.kernel.org/patch/75896/
-
-Commit a9238ce3bb0fda6e760780b702c6cbd3793087d3 broke compilation on
-platforms that do not implement GENERIC_TIME (e.g. iop32x):
-
- kernel/time/clocksource.c: In function 'clocksource_register':
- kernel/time/clocksource.c:556: error: implicit declaration of function 'clocksource_max_deferment'
-
-Provide a dummy implementation of clocksource_max_deferment() for such
-platforms.
-
-Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
-
----
-kernel/time/clocksource.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
-index 5155dc3..7b3a9d0 100644
---- a/kernel/time/clocksource.c
-+++ b/kernel/time/clocksource.c
-@@ -502,6 +502,11 @@ static void clocksource_select(void)
-
- #else /* CONFIG_GENERIC_TIME */
-
-+static inline u64 clocksource_max_deferment(struct clocksource *cs)
-+{
-+ return 0;
-+}
-+
- static inline void clocksource_select(void) { }
-
- #endif
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index d66f29f0e5..8861375808 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -3,7 +3,7 @@ require linux-openmoko.inc
DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
-KERNEL_RELEASE="2.6.32.7"
+KERNEL_RELEASE="2.6.32.8"
OEV = "oe1"
PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
@@ -16,8 +16,6 @@ SRC_URI = "\
file://defconfig \
# build fix
file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \
-# needed only for 2.6.32.7+
- file://fix.compilation.if.no.GENERIC_TIME.patch;patch=1 \
# patches from Weiss's gdrm-2.6.31 branch
file://0001-DRM-for-platform-devices.patch;patch=1 \
file://0002-Glamo-DRM-and-KMS-driver.patch;patch=1 \
@@ -28,8 +26,8 @@ SRC_URI = "\
file://0002-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch;patch=1 \
"
-SRC_URI[stablepatch.md5sum] = "a68305d3e77dddc9555ba58f678a1ce2"
-SRC_URI[stablepatch.sha256sum] = "b3382d02ec25e3ae86fac7852ba540e59af770a76604d317b39df57505b376bf"
+SRC_URI[stablepatch.md5sum] = "eabf01da4c72f7ea5b4e4bf8e8535e5f"
+SRC_URI[stablepatch.sha256sum] = "50c08a7ffcad1e7cd2e7c2c906795896dd36ce71249d816914c306dcc5875fd2"
S = "${WORKDIR}/git"