diff options
| author |   Koen Kooi <koen@openembedded.org> | 2007-09-13 10:56:52 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-13 10:56:52 +0000 |
| commit | 27e9acfbf83d8bbbf83076d7757f54e4485a0df4 (patch) | |
| tree | be4557cd5b9637feb0b21f1ab59320060a3e6de4 /packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch | |
| parent | 1c24210e3f0b3f6a5a5783ed597252d453e6bd64 (diff) | |
| parent | d49aa984dfa45e53c2ca1d62d3e772efb18ae7a7 (diff) | |
| download | openembedded-27e9acfbf83d8bbbf83076d7757f54e4485a0df4.tar.gz | |
propagate from branch 'org.openembedded.dev' (head ab0d9a488e49d9ec307f6d034845a25a157b066b)
to branch 'org.openembedded.dev.avr32' (head 4c5317ddb5784cda08980db89021f3fc1e9b786e)
Diffstat (limited to 'packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch')
| -rwxr-xr-x | packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch b/packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch index 36b52a916a..e669a51957 100755 --- a/packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/e680-locksw.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-06-08 18:38:48.000000000 +0200 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c 2007-06-08 18:38:59.000000000 +0200 +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e680.c 2007-09-06 00:48:32.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c 2007-09-06 00:49:23.000000000 -0300 @@ -16,6 +16,7 @@ #include <linux/mmc/host.h> #include <linux/irq.h> @@ -10,8 +10,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -220,8 +221,30 @@ - }, +@@ -317,10 +318,32 @@ + .resource = pcap_ts_resources, }; +static struct gpio_keys_button e680locksw_buttons[] = { @@ -36,6 +36,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c +}; + static struct platform_device *devices[] __initdata = { + &e680_pcap_device, + &e680_emu_device, &pcap_ts_device, + &e680locksw_device, }; |