Commit 8bdddfae authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'renesas-sh-drivers-for-v4.4' of...

Merge tag 'renesas-sh-drivers-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

Pull SH driver fixlet from Simon Horman:
 "I am sending this change after v4.4-rc1 has been released as it
  depends on SoC changes which are present in that rc:

   = Remove now unnecessary reference to CONFIG_ARCH_SHMOBILE_MULTI"

* tag 'renesas-sh-drivers-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  drivers: sh: Get rid of CONFIG_ARCH_SHMOBILE_MULTI
parents b4ba1f0f 0ba58de2
...@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = { ...@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
static int __init sh_pm_runtime_init(void) static int __init sh_pm_runtime_init(void)
{ {
if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) { if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
if (!of_find_compatible_node(NULL, NULL, if (!of_find_compatible_node(NULL, NULL,
"renesas,cpg-mstp-clocks")) "renesas,cpg-mstp-clocks"))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment