| Message ID | 1405590357.4808.15.camel@x220 |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Thu, Jul 17, 2014 at 11:45:57AM +0200, Paul Bolle wrote: > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > --- > Untested! Please shout if that bothers you. > > This typo entered linux-next as of today (in next-20140717). Its fix > would be fine for the trivial tree, if trivial would track linux-next. > But it doesn't. > > include/linux/tegra-soc.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I don't have this typo in my local tree, so I guess I must have fixed it sometime late yesterday but then forgot push this for linux-next. Thierry
On Thu, 2014-07-17 at 11:54 +0200, Thierry Reding wrote: > I don't have this typo in my local tree, so I guess I must have fixed it > sometime late yesterday but then forgot push this for linux-next. I see. I'll keep this patch in my local stash (which I constantly rebase onto the latest linux-next). So either it disappears automagically or I'll send you a reminder in a few weeks. Thanks, Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/tegra-soc.h b/include/linux/tegra-soc.h index 197aa5bd66d2..25caa520b784 100644 --- a/include/linux/tegra-soc.h +++ b/include/linux/tegra-soc.h @@ -81,7 +81,7 @@ void tegra_pmc_restart(enum reboot_mode mode, const char *cmd); enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void); void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode); void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode); -#endif /* CONFIG_SLEEP */ +#endif /* CONFIG_PM_SLEEP */ #ifdef CONFIG_SMP bool tegra_pmc_cpu_is_powered(int cpuid);
Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested! Please shout if that bothers you. This typo entered linux-next as of today (in next-20140717). Its fix would be fine for the trivial tree, if trivial would track linux-next. But it doesn't. include/linux/tegra-soc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)