diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 23:07:32 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-19 00:21:14 +0400 |
| commit | 05a6380cef5ec2e832871a8bd591f6af4555c335 (patch) | |
| tree | 2eac47b6cfc4583886ba8ddfe7716a9bd49877f9 | |
| parent | 65c9a8530bec45cea1137635b7992bbb417de9de (diff) | |
| download | linux-05a6380cef5ec2e832871a8bd591f6af4555c335.tar.xz | |
ARM: EXYNOS: cleanup <mach/regs-irq.h>
Remove useless inclusion <mach/regs-irq.h> for exynos.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/regs-irq.h | 19 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/pm.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/s5p-irq-pm.c | 3 |
5 files changed, 5 insertions, 22 deletions
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 <asm/mach/irq.h> #include <asm/cacheflush.h> -#include <mach/regs-irq.h> - #include <plat/cpu.h> #include <plat/pm.h> #include <plat/regs-serial.h> 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 <linux/irqchip/arm-gic.h> -#include <mach/map.h> - -#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 <plat/pll.h> #include <plat/regs-srom.h> -#include <mach/regs-irq.h> #include <mach/regs-clock.h> #include <mach/pm-core.h> 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 <mach/hardware.h> #include <mach/map.h> #include <mach/regs-clock.h> +#ifndef CONFIG_ARCH_EXYNOS #include <mach/regs-irq.h> +#endif #include <mach/irqs.h> #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 <mach/map.h> #include <mach/regs-gpio.h> + +#ifndef CONFIG_ARCH_EXYNOS #include <mach/regs-irq.h> +#endif /* state for IRQs over sleep */ |