| commit | f6ce579d91029123e4b83137d7bf5bc487b7dfb9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 22 04:26:23 2014 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 22 04:26:23 2014 +0900 |
| tree | 7fe520396f9a926769a10868eeb9340494a17053 | |
| parent | fba69f042ad99f68c0268ef1c012f3199f898fac [diff] | |
| parent | 3c90c55dcde745bed81f6447f24ba96bda43d984 [diff] |
Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
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