diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2015-12-12 00:20:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2015-12-12 00:20:43 +0100 |
| commit | 60f929730a13e69c9770221122cbdb6a91c87acf (patch) | |
| tree | 13631ece63d0a2c87827b544419d90042c8a5126 /arch/arm/mach-shmobile/Kconfig | |
| parent | Merge branch 'treewide/cleanup' into next/cleanup (diff) | |
| parent | ARM: shmobile: Remove legacy mach/irqs.h (diff) | |
| download | linux-60f929730a13e69c9770221122cbdb6a91c87acf.tar.gz linux-60f929730a13e69c9770221122cbdb6a91c87acf.tar.bz2 linux-60f929730a13e69c9770221122cbdb6a91c87acf.zip | |
Merge tag 'renesas-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Renesas ARM Based SoC Cleanup for v4.5" from Simon Horman:
* Remove now unnecessary header
* Introduce ARCH_RENESAS
* Remove unmaintened URL from MAINTAINERS
* tag 'renesas-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove legacy mach/irqs.h
ARM: shmobile: Introduce ARCH_RENESAS
MAINTAINERS: Remove link to oss.renesas.com which is closed
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 0f25f8fa2692..cd5f171f83ce 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -1,6 +1,8 @@ config ARCH_SHMOBILE bool - select ZONE_DMA if ARM_LPAE + +config ARCH_SHMOBILE_MULTI + bool config PM_RCAR bool @@ -29,10 +31,11 @@ config ARCH_RMOBILE select SYS_SUPPORTS_SH_CMT select SYS_SUPPORTS_SH_TMU -menuconfig ARCH_SHMOBILE_MULTI +menuconfig ARCH_RENESAS bool "Renesas ARM SoCs" depends on ARCH_MULTI_V7 && MMU select ARCH_SHMOBILE + select ARCH_SHMOBILE_MULTI select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ARM_GIC @@ -40,8 +43,9 @@ menuconfig ARCH_SHMOBILE_MULTI select NO_IOPORT_MAP select PINCTRL select ARCH_REQUIRE_GPIOLIB + select ZONE_DMA if ARM_LPAE -if ARCH_SHMOBILE_MULTI +if ARCH_RENESAS #comment "Renesas ARM SoCs System Type" |