summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-09-27 15:09:05 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-27 15:09:05 +0000
commitf844e030fa24adf8f2dbb8d209901b96b42d894e (patch)
tree06235b0997a40705af5928609051b31f01c22b23
parentbfeaecc75e8e7212dc3a32912e917333cedada1d (diff)
openzaurus-pxa: update APM patch to apply correct also for TOSA
-rw-r--r--packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch7
-rw-r--r--packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc2
2 files changed, 7 insertions, 2 deletions
diff --git a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch
index db16eb0497..f45fb72de3 100644
--- a/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch
+++ b/packages/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/apm_arrowkey.patch
@@ -1,10 +1,15 @@
--- linux/arch/arm/mach-pxa/sharpsl_apm.c-original 2005-09-07 02:38:21.000000000 -0600
+++ linux/arch/arm/mach-pxa/sharpsl_apm.c 2005-09-08 01:11:56.000000000 -0600
-@@ -89,6 +89,7 @@
+@@ -89,6 +89,12 @@
#include <linux/ioctl.h>
#include <asm/sharp_apm.h>
#include <asm/sharp_char.h>
++#if defined(CONFIG_ARCH_PXA_POODLE)
+#include <asm-arm/arch-pxa/keyboard_poodle.h> /* blc */
++#elif defined(CONFIG_ARCH_PXA_TOSA)
++#include <asm-arm/arch-pxa/keyboard_tosa.h>
++#define NR_KEYCODES (KEYCODE(KB_ROWS-1,KB_COLS-1)+1)
++#endif
#include <linux/delay.h>
#include <asm/arch/ads7846_ts.h>
#include <linux/apm_bios.h>
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 2a2c9561ad..aa4cc9273b 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -3,7 +3,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
SECTION = "kernel"
LICENSE = "GPL"
PV = "2.4.18-rmk7-pxa3-embedix"
-PR = "r44"
+PR = "r45"
KV = "2.4.18"
RMKV = "7"