[PATCH 2.6.20 2/14] CRIS architecture update - subarchs

[PATCH 2.6.20 2/14] CRIS architecture update - subarchs

[Mikael Starvik]

[-- Attachment #1: Type: text/plain, Size: 136 bytes --]

The attached patch corrects a few paths related to sub-architectures.
 
Signed-off-by: Mikael Starvik <starvik@axis.com>
 
/Mikael

[-- Attachment #2: cris2_arch.patch --]
[-- Type: application/octet-stream, Size: 1461 bytes --]

diff -urNP --exclude='*.cvsignore' ../linux/arch/cris/arch-v10/boot/rescue/kimagerescue.S linux-2.6/arch/cris/arch-v10/boot/rescue/kimagerescue.S
--- ../linux/arch/cris/arch-v10/boot/rescue/kimagerescue.S	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6/arch/cris/arch-v10/boot/rescue/kimagerescue.S	2006-11-29 17:05:41.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: kimagerescue.S,v 1.1 2001/12/17 13:59:27 bjornw Exp $
+/* $Id: kimagerescue.S,v 1.3 2006/11/29 16:05:41 ricardw Exp $
  * 
  * Rescue code to be prepended on a kimage and copied to the
  * rescue serial port.
@@ -7,7 +7,7 @@
  */
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/sv_addr_ag.h>
+#include <asm/arch/sv_addr_ag.h>
 
 #define CODE_START 0x40004000
 #define CODE_LENGTH 784
diff -urNP --exclude='*.cvsignore' ../linux/arch/cris/arch-v10/boot/rescue/testrescue.S linux-2.6/arch/cris/arch-v10/boot/rescue/testrescue.S
--- ../linux/arch/cris/arch-v10/boot/rescue/testrescue.S	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6/arch/cris/arch-v10/boot/rescue/testrescue.S	2006-11-29 17:05:41.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: testrescue.S,v 1.1 2001/12/17 13:59:27 bjornw Exp $
+/* $Id: testrescue.S,v 1.2 2006/11/29 16:05:41 ricardw Exp $
  *
  * Simple testcode to download by the rescue block.
  * Just lits some LEDs to show it was downloaded correctly.
@@ -7,7 +7,7 @@
  */
 
 #define ASSEMBLER_MACROS_ONLY
-#include <asm/sv_addr_ag.h>
+#include <asm/arch/sv_addr_ag.h>
 
 	.text