[ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c*

[safe/jmp/linux-2.6] / include / asm-arm / plat-s3c / uncompress.h

diff --git a/include/asm-arm/plat-s3c/uncompress.h b/include/asm-arm/plat-s3c/uncompress.h
index bc6817f..4df006b 100644 (file)
--- a/include/asm-arm/plat-s3c/uncompress.h
+++ b/include/asm-arm/plat-s3c/uncompress.h
@@ -27,8 +27,8 @@ static void arch_detect_cpu(void);
 
 /* defines for UART registers */
 
-#include "asm/plat-s3c/regs-serial.h"
-#include "asm/plat-s3c/regs-watchdog.h"
+#include <plat/regs-serial.h>
+#include <asm/plat-s3c/regs-watchdog.h>
 
 /* working in physical space... */
 #undef S3C2410_WDOGREG
@@ -92,13 +92,13 @@ static inline void flush(void)
 
 #define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0)
 
-/* CONFIG_S3C2410_BOOT_WATCHDOG
+/* CONFIG_S3C_BOOT_WATCHDOG
  *
  * Simple boot-time watchdog setup, to reboot the system if there is
  * any problem with the boot process
 */
 
-#ifdef CONFIG_S3C2410_BOOT_WATCHDOG
+#ifdef CONFIG_S3C_BOOT_WATCHDOG
 
 #define WDOG_COUNT (0xff00)
 
@@ -119,7 +119,7 @@ static void arch_decomp_wdog_start(void)
 #define arch_decomp_wdog()
 #endif
 
-#ifdef CONFIG_S3C2410_BOOT_ERROR_RESET
+#ifdef CONFIG_S3C_BOOT_ERROR_RESET
 
 static void arch_decomp_error(const char *x)
 {