From 9f23337aa52cc783ca620cd67c33ca8b3033c0e8 Mon Sep 17 00:00:00 2001 From: Jongpill Lee Date: Wed, 23 Jun 2010 21:35:03 +0900 Subject: [PATCH] --- yaml --- r: 208776 b: refs/heads/master c: 9a423b0ffdf7c75d852056447202e64822263c6a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5p6440/include/mach/system.h | 7 ++----- trunk/arch/arm/mach-s5p6442/include/mach/system.h | 7 ++----- trunk/arch/arm/mach-s5pc100/include/mach/system.h | 9 +-------- trunk/arch/arm/mach-s5pv210/include/mach/system.h | 7 ++----- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/[refs] b/[refs] index cff4171c2694..0685914cccdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7f1e82ac982dead64d2b3825b7d33db3023a514 +refs/heads/master: 9a423b0ffdf7c75d852056447202e64822263c6a diff --git a/trunk/arch/arm/mach-s5p6440/include/mach/system.h b/trunk/arch/arm/mach-s5p6440/include/mach/system.h index d2dd817da66a..a359ee3fa510 100644 --- a/trunk/arch/arm/mach-s5p6440/include/mach/system.h +++ b/trunk/arch/arm/mach-s5p6440/include/mach/system.h @@ -13,12 +13,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -static void arch_idle(void) -{ - /* nothing here yet */ -} +#include -static void arch_reset(char mode, const char *cmd) +static void arch_idle(void) { /* nothing here yet */ } diff --git a/trunk/arch/arm/mach-s5p6442/include/mach/system.h b/trunk/arch/arm/mach-s5p6442/include/mach/system.h index 8bcd8ed0c3c3..c30c1cc1b97e 100644 --- a/trunk/arch/arm/mach-s5p6442/include/mach/system.h +++ b/trunk/arch/arm/mach-s5p6442/include/mach/system.h @@ -13,12 +13,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -static void arch_idle(void) -{ - /* nothing here yet */ -} +#include -static void arch_reset(char mode, const char *cmd) +static void arch_idle(void) { /* nothing here yet */ } diff --git a/trunk/arch/arm/mach-s5pc100/include/mach/system.h b/trunk/arch/arm/mach-s5pc100/include/mach/system.h index 681f626a9ae1..a9ea57c06600 100644 --- a/trunk/arch/arm/mach-s5pc100/include/mach/system.h +++ b/trunk/arch/arm/mach-s5pc100/include/mach/system.h @@ -11,18 +11,11 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -#include -#include -#include +#include static void arch_idle(void) { /* nothing here yet */ } -static void arch_reset(char mode, const char *cmd) -{ - __raw_writel(S5PC100_SWRESET_RESETVAL, S5PC100_SWRESET); - return; -} #endif /* __ASM_ARCH_IRQ_H */ diff --git a/trunk/arch/arm/mach-s5pv210/include/mach/system.h b/trunk/arch/arm/mach-s5pv210/include/mach/system.h index 1ca04d5025b3..af8a200b2135 100644 --- a/trunk/arch/arm/mach-s5pv210/include/mach/system.h +++ b/trunk/arch/arm/mach-s5pv210/include/mach/system.h @@ -13,12 +13,9 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -static void arch_idle(void) -{ - /* nothing here yet */ -} +#include -static void arch_reset(char mode, const char *cmd) +static void arch_idle(void) { /* nothing here yet */ }