OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SH Drivers Updates for v4.4 

* Remove now unnecessary reference to CONFIG_ARCH_SHMOBILE_MULTI
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWTmroAAoJENfPZGlqN0++sFcP/1s4uHzAZiTQcLjyKQd5d77q
 O+cjw+J8WlzyU9RrIc2AI143UgprfHiSUREDx9awY8c1XTxU1O9nB1wzNm3arWTs
 EHH0EVVHD7o8ZviCaKFW64uj8e8t5rnojtODukKuTUAOF19jyV5C7YTMuRHsGzZk
 B0jNEPH/ZlMQEVHeF/4mUWUDSuh3F9ptYbffExUVgANDSANOLUqiyp9CavIdFDAZ
 cP6KU4lMgK+MmCxVW42vhoXcWSphlLWnJWi8NiFAqaYg12YoDYgbmYraG3JugIiz
 WR+k5xCQS/ptsp4oOFJ64dmUx4VcVaJA9V0Ad2921ytI4Ryi9mIK3ooEwiday+Sj
 Y4m5AsDBApeSJU8cu7fcfEmvutq9+m2TtJuKGnmubCu2eHhYePdmrfObZyeFy4Lm
 ZPrN8UO7U3zTF1gXQgQ7OU4ZdhZ3x879EfsCubro491mEv5Zii6hQzI71dKJF9rw
 7SySKOR5V8rXG26AXYV5GwxUX+DKHkqtmQ3MMxGvly8K7nhPyoAP88q1uElIhfqE
 /ht9m+svcdmF5BtklHVqePu3fv7sJnMTAN8AG3ZY4BXePW5EMDFxOBAO5QE1gdT0
 pPUCRaKifiOfb2SwwIxM3ns6OJhcQN3YI7i/ymAvTOhAqUrAEfTOMsYiT/vOFkF0
 alPYP0IEsK5o0nSqlpji
 =pRoE
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2015-11-19 17:58:44 -08:00
parent b4ba1f0f65 0ba58de231
commit 8bdddfae65
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/sh/pm_runtime.c
View File

@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
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,
"renesas,cpg-mstp-clocks"))
return 0;