Merge remote-tracking branches 'regulator/topic/bd718xx' and 'regulator/topic/pfuze100' into regulator-next

2018-10-21 17:00:05 +01:00
parent 4fd1f509e8 eb108c3611 db6565af68
commit f35b1e53a6
4 changed files with 98 additions and 1 deletions
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -49,6 +49,7 @@ int reboot_force;
 */

 void (*pm_power_off_prepare)(void);
+EXPORT_SYMBOL_GPL(pm_power_off_prepare);

 /**
 *	emergency_restart - reboot the system