diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 14:07:32 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 15:21:14 -0500 |
commit | 05a6380cef5ec2e832871a8bd591f6af4555c335 (patch) | |
tree | 2eac47b6cfc4583886ba8ddfe7716a9bd49877f9 /arch/arm | |
parent | 65c9a8530bec45cea1137635b7992bbb417de9de (diff) |
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>
Diffstat (limited to 'arch/arm')
-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 @@ | |||
37 | #include <asm/mach/irq.h> | 37 | #include <asm/mach/irq.h> |
38 | #include <asm/cacheflush.h> | 38 | #include <asm/cacheflush.h> |
39 | 39 | ||
40 | #include <mach/regs-irq.h> | ||
41 | |||
42 | #include <plat/cpu.h> | 40 | #include <plat/cpu.h> |
43 | #include <plat/pm.h> | 41 | #include <plat/pm.h> |
44 | #include <plat/regs-serial.h> | 42 | #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 @@ | |||
1 | /* linux/arch/arm/mach-exynos4/include/mach/regs-irq.h | ||
2 | * | ||
3 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * EXYNOS4 - IRQ register definitions | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ASM_ARCH_REGS_IRQ_H | ||
14 | #define __ASM_ARCH_REGS_IRQ_H __FILE__ | ||
15 | |||
16 | #include <linux/irqchip/arm-gic.h> | ||
17 | #include <mach/map.h> | ||
18 | |||
19 | #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 @@ | |||
29 | #include <plat/pll.h> | 29 | #include <plat/pll.h> |
30 | #include <plat/regs-srom.h> | 30 | #include <plat/regs-srom.h> |
31 | 31 | ||
32 | #include <mach/regs-irq.h> | ||
33 | #include <mach/regs-clock.h> | 32 | #include <mach/regs-clock.h> |
34 | #include <mach/pm-core.h> | 33 | #include <mach/pm-core.h> |
35 | 34 | ||
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 @@ | |||
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <mach/map.h> | 30 | #include <mach/map.h> |
31 | #include <mach/regs-clock.h> | 31 | #include <mach/regs-clock.h> |
32 | #ifndef CONFIG_ARCH_EXYNOS | ||
32 | #include <mach/regs-irq.h> | 33 | #include <mach/regs-irq.h> |
34 | #endif | ||
33 | #include <mach/irqs.h> | 35 | #include <mach/irqs.h> |
34 | #endif | 36 | #endif |
35 | 37 | ||
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 @@ | |||
22 | #include <mach/map.h> | 22 | #include <mach/map.h> |
23 | 23 | ||
24 | #include <mach/regs-gpio.h> | 24 | #include <mach/regs-gpio.h> |
25 | |||
26 | #ifndef CONFIG_ARCH_EXYNOS | ||
25 | #include <mach/regs-irq.h> | 27 | #include <mach/regs-irq.h> |
28 | #endif | ||
26 | 29 | ||
27 | /* state for IRQs over sleep */ | 30 | /* state for IRQs over sleep */ |
28 | 31 | ||