Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel...

Pull SH driver fix from Simon Horman:
 "Compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI

  This resolves a regression introduced in v3.14 by commit bf98c1eac1d4
  ("ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY")"

* tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI

diff --combined drivers/Makefile
index d05d81b19b50c229b2aa100bf01f8ac2818c0c1c,c033798f300a0b1dae6c44cc74ae850a5ae86c5f..7183b6af5dac2b72fc53edc7044d743eac57ed45
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -53,8 -53,8 +53,8 @@@ obj-y                         += gpu
  obj-$(CONFIG_CONNECTOR)               += connector/
  
  # i810fb and intelfb depend on char/agp/
 -obj-$(CONFIG_FB_I810)           += video/i810/
 -obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 +obj-$(CONFIG_FB_I810)           += video/fbdev/i810/
 +obj-$(CONFIG_FB_INTEL)          += video/fbdev/intelfb/
  
  obj-$(CONFIG_PARPORT)         += parport/
  obj-y                         += base/ block/ misc/ mfd/ nfc/
@@@ -119,7 -119,7 +119,7 @@@ obj-$(CONFIG_SGI_SN)               += sn
  obj-y                         += firmware/
  obj-$(CONFIG_CRYPTO)          += crypto/
  obj-$(CONFIG_SUPERH)          += sh/
- obj-$(CONFIG_ARCH_SHMOBILE_LEGACY)    += sh/
+ obj-$(CONFIG_ARCH_SHMOBILE)   += sh/
  ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
  obj-y                         += clocksource/
  endif