diff --git a/[refs] b/[refs] index e14bddd06e4e..06799df2de5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 825257569350e913bee3bc918508c0aa6e3398cd +refs/heads/master: 2ed43b63285c394cb5e1829c199cc94c7b8233b9 diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c index 0a9f269075ee..7fb805de19a8 100644 --- a/trunk/kernel/power/main.c +++ b/trunk/kernel/power/main.c @@ -55,6 +55,8 @@ int pm_notifier_call_chain(unsigned long val) #endif /* CONFIG_PM_SLEEP */ +#ifdef CONFIG_SUSPEND + #ifdef CONFIG_PM_DEBUG int pm_test_level = TEST_NONE;