diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-30 16:44:35 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-30 16:44:35 +0100 |
commit | 81c2ba4f91b62a7800e62e1aaba5783a7596c46b (patch) | |
tree | 0226753ca22e46fb026568520e0671db2f186ed0 /recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch | |
parent | 63545554b6dc63297d522280df8b3fcb1b0ba30f (diff) | |
download | meta-ti-81c2ba4f91b62a7800e62e1aaba5783a7596c46b.tar.gz |
linux-ti335x-psp: make all patches work with 'git am'
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch index b4b14b87..23a0c8f6 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch +++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3c22386bee665fb13aeb1f28016a9e77fc6c2dc2 Mon Sep 17 00:00:00 2001 | 1 | From de1ae4c44093c7f62af58caf3bdba83bb9531295 Mon Sep 17 00:00:00 2001 |
2 | From: Patil, Rachna <rachna@ti.com> | 2 | From: Patil, Rachna <rachna@ti.com> |
3 | Date: Fri, 11 Nov 2011 18:03:27 +0530 | 3 | Date: Fri, 11 Nov 2011 18:03:27 +0530 |
4 | Subject: [PATCH 1/9] AM335x: Add support for TSC on Beta GP EVM. | 4 | Subject: [PATCH 1/9] AM335x: Add support for TSC on Beta GP EVM. |
@@ -15,10 +15,10 @@ Signed-off-by: Patil, Rachna <rachna@ti.com> | |||
15 | 3 files changed, 73 insertions(+), 28 deletions(-) | 15 | 3 files changed, 73 insertions(+), 28 deletions(-) |
16 | 16 | ||
17 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | 17 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c |
18 | index 590c4ca..9ec56c6 100644 | 18 | index b27fb97..7f52de1 100644 |
19 | --- a/arch/arm/mach-omap2/board-am335xevm.c | 19 | --- a/arch/arm/mach-omap2/board-am335xevm.c |
20 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | 20 | +++ b/arch/arm/mach-omap2/board-am335xevm.c |
21 | @@ -912,6 +912,14 @@ static void dvi_init(int evm_id, int profile) | 21 | @@ -920,6 +920,14 @@ static void dvi_init(int evm_id, int profile) |
22 | static void tsc_init(int evm_id, int profile) | 22 | static void tsc_init(int evm_id, int profile) |
23 | { | 23 | { |
24 | int err; | 24 | int err; |
@@ -215,5 +215,5 @@ index 29f87db..b9d9a46 100644 | |||
215 | + | 215 | + |
216 | }; | 216 | }; |
217 | -- | 217 | -- |
218 | 1.7.4.1 | 218 | 1.7.2.5 |
219 | 219 | ||