From 05a6380cef5ec2e832871a8bd591f6af4555c335 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Thu, 19 Dec 2013 04:07:32 +0900 Subject: [PATCH] ARM: EXYNOS: cleanup Remove useless inclusion for exynos. Signed-off-by: Kukjin Kim --- arch/arm/mach-exynos/common.c | 2 -- arch/arm/mach-exynos/include/mach/regs-irq.h | 19 ------------------- arch/arm/mach-exynos/pm.c | 1 - arch/arm/plat-samsung/pm.c | 2 ++ arch/arm/plat-samsung/s5p-irq-pm.c | 3 +++ 5 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/regs-irq.h diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 1fc042481c5b..52cef6a2a825 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include diff --git a/arch/arm/mach-exynos/include/mach/regs-irq.h b/arch/arm/mach-exynos/include/mach/regs-irq.h deleted file mode 100644 index f2b50506b9f6..000000000000 --- a/arch/arm/mach-exynos/include/mach/regs-irq.h +++ /dev/null @@ -1,19 +0,0 @@ -/* linux/arch/arm/mach-exynos4/include/mach/regs-irq.h - * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * EXYNOS4 - IRQ register definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_REGS_IRQ_H -#define __ASM_ARCH_REGS_IRQ_H __FILE__ - -#include -#include - -#endif /* __ASM_ARCH_REGS_IRQ_H */ diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index a577eb929bee..11c37c4f04fb 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 416e5bea54f9..001d6fc6899c 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c @@ -29,7 +29,9 @@ #include #include #include +#ifndef CONFIG_ARCH_EXYNOS #include +#endif #include #endif diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c index 7c1e3b7072fc..591498035916 100644 --- a/arch/arm/plat-samsung/s5p-irq-pm.c +++ b/arch/arm/plat-samsung/s5p-irq-pm.c @@ -22,7 +22,10 @@ #include #include + +#ifndef CONFIG_ARCH_EXYNOS #include +#endif /* state for IRQs over sleep */ -- 2.20.1