| From 04e83252db26ec9123e3a2f9095d0c8f066ccf85 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Sun, 23 Mar 2014 20:36:18 +0100 |
| Subject: 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> |
| |
| (cherry picked from commit e35db38d66d1e4007cfc1bb90a05e11b4aaee2a8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index d833fa4ea883..d19a06899e10 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -108,6 +108,7 @@ config ARCH_R8A7778 |
| select SH_CLK_CPG |
| select ARM_GIC |
| select SYS_SUPPORTS_SH_TMU |
| + select RENESAS_INTC_IRQPIN |
| |
| config ARCH_R8A7779 |
| bool "R-Car H1 (R8A77790)" |
| @@ -206,7 +207,6 @@ config MACH_BOCKW |
| depends on ARCH_R8A7778 |
| select ARCH_REQUIRE_GPIOLIB |
| select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| - select RENESAS_INTC_IRQPIN |
| select SND_SOC_AK4554 if SND_SIMPLE_CARD |
| select SND_SOC_AK4642 if SND_SIMPLE_CARD |
| select USE_OF |
| @@ -215,7 +215,6 @@ config MACH_BOCKW_REFERENCE |
| bool "BOCK-W - Reference Device Tree Implementation" |
| depends on ARCH_R8A7778 |
| select ARCH_REQUIRE_GPIOLIB |
| - select RENESAS_INTC_IRQPIN |
| select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| select USE_OF |
| ---help--- |
| -- |
| 2.1.2 |
| |
