diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-03-29 13:02:23 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2016-03-29 13:02:23 -0700 |
| commit | 1df133c0db64d633bbb9b238aa0e1588e2c5e7d6 (patch) | |
| tree | c68d76907c523e81b5d0e8a924728f9e1aed1844 /arch/arm/include/asm/psci.h | |
| parent | 2b7d39d1a28cb478627fc22fdc8dd77ed89ffe92 (diff) | |
| parent | 62e21959dc6f25c5fce0c1a0934e4a9d982bf99b (diff) | |
Merge tag 'v4.4.5' into toradex_vf_4.4-next
This is the 4.4.5 stable release
Diffstat (limited to 'arch/arm/include/asm/psci.h')
| -rw-r--r-- | arch/arm/include/asm/psci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index 68ee3ce17b82..b4c6d99364f1 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -16,7 +16,7 @@ extern struct smp_operations psci_smp_ops; -#ifdef CONFIG_ARM_PSCI +#if defined(CONFIG_SMP) && defined(CONFIG_ARM_PSCI) bool psci_smp_available(void); #else static inline bool psci_smp_available(void) { return false; } |