From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 11 Dec 2015 23:20:43 +0000 (+0100)
Subject: Merge tag 'renesas-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=60f929730a13e69c9770221122cbdb6a91c87acf;p=linux-beck.git

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
---

60f929730a13e69c9770221122cbdb6a91c87acf
diff --cc arch/arm/mach-shmobile/Kconfig
index 0f25f8fa2692,4ed72b124235..cd5f171f83ce
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -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