aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@linux-m68k.org>2014-03-23 15:36:18 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-04-13 22:28:43 -0400
commite35db38d66d1e4007cfc1bb90a05e11b4aaee2a8 (patch)
tree0cb9774bd35df988a3ec6ef6bed3d15bcd968595
parent277efd30cfc72ec2f44a9bc95d93807b867bd9e9 (diff)
ARM: shmobile: r8a7778/bockw: Move "select RENESAS_INTC_IRQPIN" under SoC
Move the "select RENESAS_INTC_IRQPIN" from the two bockw-specific sections to the one r8a7778-specific section, like is done for the other SoCs. Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> [horms+renesas@verge.net.au: Resolved conflict] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index ad0c6bc2747d..58bc6db6e79d 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -108,6 +108,7 @@ config ARCH_R8A7778
108 select SH_CLK_CPG 108 select SH_CLK_CPG
109 select ARM_GIC 109 select ARM_GIC
110 select SYS_SUPPORTS_SH_TMU 110 select SYS_SUPPORTS_SH_TMU
111 select RENESAS_INTC_IRQPIN
111 112
112config ARCH_R8A7779 113config ARCH_R8A7779
113 bool "R-Car H1 (R8A77790)" 114 bool "R-Car H1 (R8A77790)"
@@ -206,7 +207,6 @@ config MACH_BOCKW
206 depends on ARCH_R8A7778 207 depends on ARCH_R8A7778
207 select ARCH_REQUIRE_GPIOLIB 208 select ARCH_REQUIRE_GPIOLIB
208 select REGULATOR_FIXED_VOLTAGE if REGULATOR 209 select REGULATOR_FIXED_VOLTAGE if REGULATOR
209 select RENESAS_INTC_IRQPIN
210 select SND_SOC_AK4554 if SND_SIMPLE_CARD 210 select SND_SOC_AK4554 if SND_SIMPLE_CARD
211 select SND_SOC_AK4642 if SND_SIMPLE_CARD 211 select SND_SOC_AK4642 if SND_SIMPLE_CARD
212 select USE_OF 212 select USE_OF
@@ -215,7 +215,6 @@ config MACH_BOCKW_REFERENCE
215 bool "BOCK-W - Reference Device Tree Implementation" 215 bool "BOCK-W - Reference Device Tree Implementation"
216 depends on ARCH_R8A7778 216 depends on ARCH_R8A7778
217 select ARCH_REQUIRE_GPIOLIB 217 select ARCH_REQUIRE_GPIOLIB
218 select RENESAS_INTC_IRQPIN
219 select REGULATOR_FIXED_VOLTAGE if REGULATOR 218 select REGULATOR_FIXED_VOLTAGE if REGULATOR
220 select USE_OF 219 select USE_OF
221 ---help--- 220 ---help---