Merge branch 'master' into next

[u-boot] / cpu / arm1176 / cpu.c

diff --git a/cpu/arm1176/cpu.c b/cpu/arm1176/cpu.c
index c59a77b9d823dda15bbcbdb1125b10b815be220a..2c0014f2bd5a4856a3cefc3202774867547beca4 100644 (file)
--- a/cpu/arm1176/cpu.c
+++ b/cpu/arm1176/cpu.c
@@ -33,7 +33,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <s3c6400.h>
+#include <asm/arch/s3c6400.h>
 #include <asm/system.h>
 
 static void cache_flush (void);
@@ -58,22 +58,6 @@ int cleanup_before_linux (void)
        return 0;
 }
 
-
-/* * reset the cpu by setting up the watchdog timer and let him time out */
-void reset_cpu (ulong ignored)
-{
-       printf("reset... \n\n\n");
-       SW_RST_REG = 0x6400;
-       /* loop forever and wait for reset to happen */
-       while (1) {
-               if (serial_tstc()) {
-                       serial_getc();
-                       break;
-               }
-       }
-       /*NOTREACHED*/
-}
-
 /* flush I/D-cache */
 static void cache_flush (void)
 {