diff options
Diffstat (limited to 'include/linux/psci.h')
| -rw-r--r-- | include/linux/psci.h | 9 | 
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index e2bacc6fd2f2..ebe0a881d13d 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -7,6 +7,7 @@  #ifndef __LINUX_PSCI_H  #define __LINUX_PSCI_H +#include <linux/arm-smccc.h>  #include <linux/init.h>  #include <linux/types.h> @@ -18,12 +19,6 @@ bool psci_tos_resident_on(int cpu);  int psci_cpu_suspend_enter(u32 state);  bool psci_power_state_is_valid(u32 state); -enum psci_conduit { -	PSCI_CONDUIT_NONE, -	PSCI_CONDUIT_SMC, -	PSCI_CONDUIT_HVC, -}; -  enum smccc_version {  	SMCCC_VERSION_1_0,  	SMCCC_VERSION_1_1, @@ -38,7 +33,7 @@ struct psci_operations {  	int (*affinity_info)(unsigned long target_affinity,  			unsigned long lowest_affinity_level);  	int (*migrate_info_type)(void); -	enum psci_conduit conduit; +	enum arm_smccc_conduit conduit;  	enum smccc_version smccc_version;  };  | 
