From: Arnd Bergmann Date: Fri, 5 Sep 2014 15:08:14 +0000 (+0200) Subject: Merge tag 'renesas-soc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.18-rc1~120^2~32 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=a6fff11391e7bf170ed803d2786df4cb34258546 Merge tag 'renesas-soc-for-v3.18' of git://git./linux/kernel/git/horms/renesas into next/soc Merge "Renesas ARM Based SoC Updates for v3.18" from Simon Horman: * Remove unnecessary nr_irqs initialisation on sh73a0, sh7372, and r8a7779 SoCs * Use defines hardcoded numbers for DMA * Rework multiplatform include workaround * Correctly use shmobile_init_late on a wider range of SoCs Signed-off-by: Arnd Bergmann * tag 'renesas-soc-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY ARM: shmobile: dma: Use defines instead of hardcoded numbers ARM: shmobile: Rework multiplatform include workaround ARM: shmobile: r7s72100: Add shmobile_init_late() ARM: shmobile: r8a73a4: Add shmobile_init_late() ARM: shmobile: r8a7778: Fix shmobile_init_late() ARM: shmobile: r8a7779: Fix shmobile_init_late() ARM: shmobile: sh73a0: Add shmobile_init_late() ARM: shmobile: r8a7778: Add missing call to shmobile_init_late() --- a6fff11391e7bf170ed803d2786df4cb34258546