summaryrefslogtreecommitdiff
path: root/packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-09-07 08:10:33 +0000
committerKoen Kooi <koen@openembedded.org>2007-09-07 08:10:33 +0000
commitf7637ba582fcafd1dbe74614288522d479f9f95a (patch)
tree41979c7a0c1d65f609411e2f28340db2bbf1952c /packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
parent276505761d55c8b8b1af7bbeacc1c14b9b2b4791 (diff)
linux-ezx: use linux.inc to avoid duplication, update patches, add asoc patch
Diffstat (limited to 'packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch')
-rwxr-xr-xpackages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch b/packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
index 902889abe6..9f26b3dd94 100755
--- a/packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c
===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a780.c 2007-05-24 00:54:38.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c 2007-05-24 00:56:22.000000000 -0300
-@@ -16,18 +16,21 @@
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a780.c 2007-08-01 19:52:09.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c 2007-08-01 19:56:13.000000000 -0300
+@@ -16,6 +16,7 @@
#include <linux/fb.h>
#include <linux/mmc/host.h>
#include <linux/irq.h>
@@ -10,13 +10,13 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
- #include <asm/arch/pxa-regs.h>
- #include <asm/arch/pxafb.h>
+@@ -24,11 +25,13 @@
+ #include <asm/arch/ezx.h>
+ #include <asm/arch/ezx-pcap.h>
#include <asm/arch/mmc.h>
+#include <asm/arch/kbd.h>
#include "generic.h"
- #include "ezx.h"
extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
extern void ezx_backlight_power(int);
@@ -24,8 +24,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c
#ifdef CONFIG_EZX_PCAP
extern int ezx_pcap_mmcsd_power(int);
-@@ -141,6 +144,55 @@
- .pxafb_lcd_power = &ezx_lcd_power,
+@@ -243,6 +246,55 @@
+ .resource = a780_emu_resources,
};
+static unsigned char a780_keycode[] = {
@@ -78,9 +78,9 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c
+};
+
static struct platform_device *devices[] __initdata = {
- };
-
-@@ -159,6 +211,7 @@
+ &a780_pcap_device,
+ &a780_emu_device,
+@@ -263,6 +315,7 @@
set_pxa_fb_info(&a780_fb_info);
pxa_set_mci_info(&a780_mci_platform_data);