diff --git a/[refs] b/[refs] index 6d7c87f5978f..f69c5a0f14f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62b3a04d75d2dc9480d5ad3b60f4258e548a6a83 +refs/heads/master: ff31977782a05504f2586ec9e3e5ab4b09a4c893 diff --git a/trunk/kernel/power/poweroff.c b/trunk/kernel/power/poweroff.c index 715081b2d829..7a4144ba3afd 100644 --- a/trunk/kernel/power/poweroff.c +++ b/trunk/kernel/power/poweroff.c @@ -9,6 +9,7 @@ #include #include #include +#include /* * When the user hits Sys-Rq o to power down the machine this is the @@ -17,8 +18,7 @@ static void do_poweroff(void *dummy) { - if (pm_power_off) - pm_power_off(); + kernel_power_off(); } static DECLARE_WORK(poweroff_work, do_poweroff, NULL);