diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 19:01:18 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-13 19:01:18 +0300 |
| commit | 2516a932efff0573de271ed3e6ad2327aa34c887 (patch) | |
| tree | c4c3487dc2ea37953b7bea39005dacbb91b3cb23 /include | |
| parent | 94db5b98d0bc56729e8f3cf2e1673017860c4a3a (diff) | |
| parent | 7892158a96629c46c46dfae52eaf951f51222cf5 (diff) | |
| download | linux-2516a932efff0573de271ed3e6ad2327aa34c887.tar.xz | |
Merge tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Merge "ARM: tegra: Core SoC changes for v4.2-rc1" from Thierry Reding:
A couple of changes to the core SoC support code. Perhaps the most
important part is a fix for a regression in LP1 suspend/resume code that
was introduced a while back.
* tag 'tegra-for-4.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
soc/tegra: pmc: move to using a restart handler
ARM: tegra20: Store CPU "resettable" status in IRAM
soc/tegra: Watch wait_for_completion_timeout() return type
Diffstat (limited to 'include')
| -rw-r--r-- | include/soc/tegra/pmc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/soc/tegra/pmc.h b/include/soc/tegra/pmc.h index 65a93273e72f..f5c0de43a5fa 100644 --- a/include/soc/tegra/pmc.h +++ b/include/soc/tegra/pmc.h @@ -26,8 +26,6 @@ struct clk; struct reset_control; -void tegra_pmc_restart(enum reboot_mode mode, const char *cmd); - #ifdef CONFIG_PM_SLEEP enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void); void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode); |