aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/tslib
diff options
context:
space:
mode:
authorSimon Busch <morphis@gravedo.de>2010-10-22 20:02:15 +0200
committerSimon Busch <morphis@gravedo.de>2010-10-22 20:02:51 +0200
commitc0155f9063b0edecd77ab7e10f483cf82b6dc384 (patch)
tree1dbf10f35d733cf1f82516df624d7ce954cc88ff /recipes/tslib
parent93c4d9d84096c817e74abf3f4c02f82af4c95178 (diff)
downloadopenembedded-c0155f9063b0edecd77ab7e10f483cf82b6dc384.tar.gz
tslib: bump git SRCREV and update include-cy8mrln-header.patch accordingly
Signed-off-by: Simon Busch <morphis@gravedo.de>
Diffstat (limited to 'recipes/tslib')
-rw-r--r--recipes/tslib/tslib/include-cy8mrln-header.patch13
-rw-r--r--recipes/tslib/tslib_git.bb4
2 files changed, 6 insertions, 11 deletions
diff --git a/recipes/tslib/tslib/include-cy8mrln-header.patch b/recipes/tslib/tslib/include-cy8mrln-header.patch
index 11e3e8fcea..983c103f71 100644
--- a/recipes/tslib/tslib/include-cy8mrln-header.patch
+++ b/recipes/tslib/tslib/include-cy8mrln-header.patch
@@ -1,6 +1,6 @@
-From 139abce63c08a18d94b00af03c3cf39d9fcac507 Mon Sep 17 00:00:00 2001
+From af4ddffd012071cf1bb721a5d37573544efc34f3 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
-Date: Sat, 18 Sep 2010 11:41:43 +0200
+Date: Fri, 22 Oct 2010 19:37:07 +0200
Subject: [PATCH] cy8mrln-palmpre: ship cy8mrln header file with tslib
---
@@ -10,19 +10,14 @@ Subject: [PATCH] cy8mrln-palmpre: ship cy8mrln header file with tslib
create mode 100644 plugins/cy8mrln.h
diff --git a/plugins/cy8mrln-palmpre.c b/plugins/cy8mrln-palmpre.c
-index fe94d21..a02add2 100644
+index ebb4968..8b78fff 100644
--- a/plugins/cy8mrln-palmpre.c
+++ b/plugins/cy8mrln-palmpre.c
-@@ -24,12 +24,12 @@
+@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
-#include <linux/spi/cy8mrln.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stddef.h>
+#include "cy8mrln.h"
#include "config.h"
#include "tslib-private.h"
diff --git a/recipes/tslib/tslib_git.bb b/recipes/tslib/tslib_git.bb
index d06b158520..b62cf89e27 100644
--- a/recipes/tslib/tslib_git.bb
+++ b/recipes/tslib/tslib_git.bb
@@ -1,8 +1,8 @@
SRC_URI = "git://github.com/kergoth/tslib.git;protocol=git"
S = "${WORKDIR}/git"
-SRCREV = "d9ff92d46a1e17361ac1"
+SRCREV = "5243db505b109df3001f"
PV = "1.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
DEFAULT_PREFERENCE = "-1"