diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-19 23:38:57 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-19 23:38:57 +0300 |
| commit | 66669fcf809c1e3ff644b12e04e625d3737ffd8e (patch) | |
| tree | 362111f12b9dcf33eb31e165d882957df45fc896 /arch/arm/include/asm/psci.h | |
| parent | f60d0603edca472c4458b30956f38c6c1a836d66 (diff) | |
| parent | 0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d (diff) | |
| download | u-boot-66669fcf809c1e3ff644b12e04e625d3737ffd8e.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/cpu/armv8/Makefile
arch/arm/lib/bootm-fdt.c
Diffstat (limited to 'arch/arm/include/asm/psci.h')
| -rw-r--r-- | arch/arm/include/asm/psci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index 7ba7ce306a..e76ecb27a7 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -64,6 +64,7 @@ void psci_cpu_off_common(void); int psci_update_dt(void *fdt); void psci_board_init(void); +int fdt_psci(void *fdt); #endif /* ! __ASSEMBLY__ */ #endif /* __ARM_PSCI_H__ */ |