diff options
author | Rod Whitby <rod@whitby.id.au> | 2007-09-10 13:59:35 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2007-09-10 13:59:35 +0000 |
commit | 80d6d6cc021aad512e6f1bb6fb04325e3268504a (patch) | |
tree | bc10776eca240a2679b2cdc300645dc9dad39db9 /packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch | |
parent | 75a5118ed6a5b1e47ca4cc919a0d7024bce0bb2a (diff) | |
parent | 42f75b6ec3c0c9367e39fe927cbbdfa256cc28af (diff) |
merge of '6e9b78a5c703daeb1a1bbbe92e36290093562200'
and '92292c95570e7e9726cb59c43fba57b359eba5c2'
Diffstat (limited to 'packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch')
-rwxr-xr-x | packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch b/packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch index 0d2047c2c1..ffd8bbb754 100755 --- a/packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch @@ -1,7 +1,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e680.c 2007-08-01 19:55:54.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c 2007-08-01 19:56:21.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e680.c 2007-09-07 11:07:33.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c 2007-09-07 11:10:47.000000000 -0300 @@ -15,6 +15,7 @@ #include <linux/fb.h> #include <linux/mmc/host.h> @@ -24,7 +24,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c #ifdef CONFIG_EZX_PCAP extern int ezx_pcap_mmcsd_power(int); -@@ -246,6 +249,58 @@ +@@ -238,6 +241,58 @@ .resource = e680_emu_resources, }; @@ -83,7 +83,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c static struct platform_device *devices[] __initdata = { &e680_pcap_device, &e680_emu_device, -@@ -266,6 +321,7 @@ +@@ -258,6 +313,7 @@ set_pxa_fb_info(&e680_fb_info); pxa_set_mci_info(&e680_mci_platform_data); |