diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 00:17:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 00:17:55 +0100 |
| commit | 80f7273c05b3447c5890ee6eb639d7c49ce100d7 (patch) | |
| tree | 478a948e76d8f660b0f3b898c1094df5b172e433 /arch/arm/include/asm/psci.h | |
| parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
| parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
Merge branch 'treewide/cleanup' into next/cleanup
These are a couple of changes that may conflict with other branches,
so we're keeping them in a separate branch that can be merged into
those if necessary.
* treewide/cleanup:
ARM: use "depends on" for SoC configs instead of "if" after prompt
ARM/clocksource: use automatic DT probing for ux500 PRCMU
ARM: use const and __initconst for smp_operations
ARM: hisi: do not export smp_operations structures
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..97735a8ff451 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -14,7 +14,7 @@ #ifndef __ASM_ARM_PSCI_H #define __ASM_ARM_PSCI_H -extern struct smp_operations psci_smp_ops; +extern const struct smp_operations psci_smp_ops; #ifdef CONFIG_ARM_PSCI bool psci_smp_available(void); |