Merge tag 'renesas-cleanup2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "Second Round of Renesas ARM Based SoC Cleanup for v4.6" from Simon Horman:

* Remove stale comment from Kconfig
* Consolidate SCU mapping code

* tag 'renesas-cleanup2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Kconfig: Get rid of old comment
  ARM: shmobile: Consolidate SCU mapping code

diff --combined arch/arm/mach-shmobile/headsmp-scu.S
index c0008a5aa4ca05a4867f171da1fc6ba2b5aaafbf,5e503d91ad70ddf2b8f375ffaf36a09361c9be8c..936d7011c3141b73228c923129f29f3635b0df13
--- 1/arch/arm/mach-shmobile/headsmp-scu.S
--- 2/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@@ -27,7 -27,7 +27,7 @@@
   */
  ENTRY(shmobile_boot_scu)
                                        @ r0 = SCU base address
 -      mrc     p15, 0, r1, c0, c0, 5   @ read MIPDR
 +      mrc     p15, 0, r1, c0, c0, 5   @ read MPIDR
        and     r1, r1, #3              @ mask out cpu ID
        lsl     r1, r1, #3              @ we will shift by cpu_id * 8 bits
        ldr     r2, [r0, #8]            @ SCU Power Status Register
@@@ -38,9 -38,3 +38,3 @@@
  
        b       secondary_startup
  ENDPROC(shmobile_boot_scu)
- 
-       .text
-       .align  2
-       .globl  shmobile_scu_base
- shmobile_scu_base:
-       .space  4