From 96bc024cdcfc4087a592ae258f21355509e21614 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Thu, 30 Jul 2015 02:00:52 +0900 Subject: [PATCH] ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx This patch moves watchdog-reset header file into mach-s3c64xx. Because it is not used for others except mach-s3c64xx. Cc: Krzysztof Kozlowski Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/common.c | 2 +- arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 3 +-- .../include/plat => mach-s3c64xx}/watchdog-reset.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h (91%) diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 316df5a3dc82..4a9621b1226e 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -50,10 +50,10 @@ #include #include #include -#include #include "common.h" #include "irq-uart.h" +#include "watchdog-reset.h" /* External clock frequency */ static unsigned long xtal_f = 12000000, xusbxti_f = 48000000; diff --git a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c index 2fddf38192df..ead3766672bb 100644 --- a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +++ b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c @@ -15,11 +15,10 @@ #include #include -#include - #include #include "common.h" +#include "watchdog-reset.h" /* * IO mapping for shared system controller IP. diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/mach-s3c64xx/watchdog-reset.h similarity index 91% rename from arch/arm/plat-samsung/include/plat/watchdog-reset.h rename to arch/arm/mach-s3c64xx/watchdog-reset.h index 0386b8f76623..42707dfbda9c 100644 --- a/arch/arm/plat-samsung/include/plat/watchdog-reset.h +++ b/arch/arm/mach-s3c64xx/watchdog-reset.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-s3c/include/plat/watchdog-reset.h - * +/* * Copyright (c) 2008 Simtec Electronics * Ben Dooks * -- 2.20.1