diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:09:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:09:59 +0800 |
| commit | 7b8892bba12eba95f3e1615dfeb8ad77e3b0371a (patch) | |
| tree | 70b4cc1f7003724e722f9fcbd0956e7920c2e854 /arch/arm64/include/asm/psci.h | |
| parent | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (diff) | |
| parent | efab1adba28d9ebbfa86808375fc085c4e84e746 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.01-android
Diffstat (limited to 'arch/arm64/include/asm/psci.h')
| -rw-r--r-- | arch/arm64/include/asm/psci.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h deleted file mode 100644 index 2454bc59c916..000000000000 --- a/arch/arm64/include/asm/psci.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Copyright (C) 2013 ARM Limited - */ - -#ifndef __ASM_PSCI_H -#define __ASM_PSCI_H - -int psci_dt_init(void); -int psci_acpi_init(void); - -#endif /* __ASM_PSCI_H */ |