diff --git a/[refs] b/[refs] index b3f4150af1fa..ad73c5180db1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a84c96e202c286c1d56fed4a81bd850017aa2c64 +refs/heads/master: a3305a8835ed039363822523a3cac24e990083dc diff --git a/trunk/arch/mips/kernel/reset.c b/trunk/arch/mips/kernel/reset.c index 5e37df3111ad..ae2ba67b7ef6 100644 --- a/trunk/arch/mips/kernel/reset.c +++ b/trunk/arch/mips/kernel/reset.c @@ -12,9 +12,6 @@ #include #include -void (*pm_power_off)(void); -EXPORT_SYMBOL(pm_power_off); - /* * Urgs ... Too many MIPS machines to handle this in a generic way. * So handle all using function pointers to machine specific @@ -36,9 +33,6 @@ void machine_halt(void) void machine_power_off(void) { - if (pm_power_off) - pm_power_off(); - _machine_power_off(); }