diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:37:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:37:41 +0200 |
| commit | 70814a9b32a2aad39ec76f0606dd2c69a14f2aea (patch) | |
| tree | 079d1cee6ad9ff0f8880390222a14ab73848e14a /arch/arm/mach-tegra/cpuidle.h | |
| parent | 979f97ddad4bd188b4f09dd6b46514bbd5117d0b (diff) | |
| parent | da35cbcafad3d46daa96a6f01022f11842e8e7b6 (diff) | |
Merge tag 'tegra-for-4.8-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup
Merge "ARM: tegra: Core SoC changes for v4.8-rc1" into next/cleanup:
Some cleanups to eliminate sparse warnings and a section mismatch.
* tag 'tegra-for-4.8-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Remove board_init_funcs array
ARM: tegra: pm: Add tegra_cpu_do_idle() prototype
ARM: tegra: irq: Add missing irq.h include
ARM: tegra: cpuidle: Add missing cpuidle.h include
ARM: tegra: hotplug: Include missing common.h
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle.h')
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/cpuidle.h b/arch/arm/mach-tegra/cpuidle.h index c017dab60ffa..dd1624d4b294 100644 --- a/arch/arm/mach-tegra/cpuidle.h +++ b/arch/arm/mach-tegra/cpuidle.h @@ -23,8 +23,10 @@ void tegra20_cpuidle_pcie_irqs_in_use(void); int tegra30_cpuidle_init(void); int tegra114_cpuidle_init(void); void tegra_cpuidle_init(void); +void tegra_cpuidle_pcie_irqs_in_use(void); #else static inline void tegra_cpuidle_init(void) {} +static inline void tegra_cpuidle_pcie_irqs_in_use(void) {} #endif #endif |