diff options
author | Tom Rini <tom_rini@mentor.com> | 2011-03-16 12:03:53 -0700 |
---|---|---|
committer | Steffen Sledz <sledz@dresearch-fe.de> | 2011-04-29 14:08:39 +0200 |
commit | e9d796d3d91043e0a9386e0eba8a713bf5d0baf2 (patch) | |
tree | 07833dad79684ac17c0b784e15a95db4f2fbb9f7 /recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch | |
parent | 2685ca76fd11c9bc2b1e96b1e4c40fc3b9763691 (diff) | |
download | openembedded-e9d796d3d91043e0a9386e0eba8a713bf5d0baf2.tar.gz |
In a large number of patches, remove unneeded '..' in paths.
In most cases we had both ../foopkg/foopkg as the first path and
this simply became foopkg (the second path was already correct for
the default strip level which is why the patch applies normally).
In a few cases the second path was '.' which is valid but not as
clear as 'b' (which is what git shows for example) so update
that while we're at it.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch')
-rw-r--r-- | recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch b/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch index 7b5f408c37..76eaf3fcba 100644 --- a/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch +++ b/recipes/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch @@ -1,6 +1,6 @@ -diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/arm/boot/compressed/head-at91rm9200.S ---- ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200 -+++ ./arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S +--- linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200 ++++ b/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200 @@ -73,6 +73,12 @@ cmp r7, r3 beq 99f @@ -14,9 +14,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/a @ Unknown board, use the AT91RM9200DK board @ mov r7, #MACH_TYPE_AT91RM9200 mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) -diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at91/board-sarge.c ---- ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100 -+++ ./arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c b/arch/arm/mach-at91/board-sarge.c +--- linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200 @@ -0,0 +1,190 @@ +/* + * linux/arch/arm/mach-at91/board-sarge.c @@ -208,9 +208,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at + .init_irq = sarge_init_irq, + .init_machine = sarge_board_init, +MACHINE_END -diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kconfig ---- ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200 -+++ ./arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig +--- linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200 ++++ b/arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200 @@ -90,6 +90,13 @@ config MACH_KAFA help Select this if you are using Sperry-Sun's KAFA board. @@ -225,9 +225,9 @@ diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kco config MACH_CHUB bool "Promwad Chub board" depends on ARCH_AT91RM9200 -diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Makefile ./arch/arm/mach-at91/Makefile ---- ../linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200 -+++ ./arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200 +diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile +--- linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200 ++++ b/arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200 @@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200) += board-kb920 obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_KAFA) += board-kafa.o |