]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge tag 'renesas-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2015 23:20:43 +0000 (00:20 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 11 Dec 2015 23:20:43 +0000 (00:20 +0100)
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

1  2 
MAINTAINERS
arch/arm/mach-shmobile/Kconfig

diff --cc MAINTAINERS
Simple merge
index 0f25f8fa269284a96d22e7501a26b6e2bc8cab5c,4ed72b124235f371c1f6869c30c36a7a7bd1005f..cd5f171f83ce64207977f82ec562b86f913e0356
@@@ -29,10 -31,11 +31,11 @@@ config ARCH_RMOBIL
        select SYS_SUPPORTS_SH_CMT
        select SYS_SUPPORTS_SH_TMU
  
- menuconfig ARCH_SHMOBILE_MULTI
+ menuconfig ARCH_RENESAS
 -      bool "Renesas ARM SoCs" if ARCH_MULTI_V7
 -      depends on MMU
 +      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