Commit 056a72a5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'drivers/psci2' into next/drivers 



* drivers/psci2:
  drivers: psci: make PSCI 1.0 functions initialization version dependent

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 825294cd 79b04beb

drivers/firmware/psci.c

+4 −3
Original line number Diff line number Diff line
@@ -347,9 +347,10 @@ static int __init psci_probe(void) 


	psci_init_migrate();



	if (PSCI_VERSION_MAJOR(ver) >= 1) {

		psci_init_cpu_suspend();



		psci_init_system_suspend();

	}



	return 0;

}