CRIS: Merge machine dependent boot/compressed and boot/rescue

[net-next-2.6.git] / arch / cris / boot / compressed / head_v10.S

diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/boot/compressed/head_v10.S
similarity index 97%
rename from arch/cris/arch-v10/boot/compressed/head.S
rename to arch/cris/boot/compressed/head_v10.S
index 0bb4dcc29254fb31f2af7e2256abb6f9d395f766..9edb8ade7e1fa90da627cd067258607a8b7f50e9 100644 (file)
--- a/arch/cris/arch-v10/boot/compressed/head.S
+++ b/arch/cris/boot/compressed/head_v10.S
@@ -30,7 +30,7 @@
        beq     dram_init_finished
        nop
 
-#include "../../lib/dram_init.S"
+#include "../../arch-v10/lib/dram_init.S"
 
 dram_init_finished:
 
@@ -123,4 +123,4 @@ _cmd_line_magic:
        .dword 0
 _cmd_line_addr:
        .dword 0
-#include "../../lib/hw_settings.S"
+#include "../../arch-v10/lib/hw_settings.S"