Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a735d5e1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: restart-header: support multiplatform"

parents 20347c3a 7282d50d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
#include <mach/gpiomux.h>
#include <mach/msm_iomap.h>
#include <mach/msm_memtypes.h>
#include <mach/restart.h>
#include <soc/qcom/restart.h>
#include <soc/qcom/socinfo.h>
#include <soc/qcom/rpm-smd.h>
#include <soc/qcom/smd.h>
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
#include <soc/qcom/pm.h>
#include <soc/qcom/rpm-smd.h>
#include <soc/qcom/smd.h>
#include <mach/restart.h>
#include <soc/qcom/restart.h>

#include <linux/io.h>
#include <linux/gpio.h>
+1 −1
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@
#include <mach/msm_bus.h>
#include <mach/gpiomux.h>
#include <mach/msm_iomap.h>
#include <mach/restart.h>
#include <mach/msm_memtypes.h>
#include <soc/qcom/restart.h>
#include <soc/qcom/socinfo.h>
#include <mach/board.h>
#include <soc/qcom/rpm-smd.h>
+1 −1
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@
#include <mach/board.h>
#include <mach/gpiomux.h>
#include <mach/msm_iomap.h>
#include <mach/restart.h>
#include <linux/regulator/qpnp-regulator.h>
#include <linux/regulator/rpm-smd-regulator.h>
#include <mach/msm_memtypes.h>
#include <soc/qcom/socinfo.h>
#include <soc/qcom/restart.h>
#include <mach/board.h>
#include <soc/qcom/rpm-smd.h>
#include <soc/qcom/smd.h>
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
#include <mach/gpiomux.h>
#include <mach/msm_iomap.h>
#include <mach/msm_memtypes.h>
#include <mach/restart.h>
#include <soc/qcom/restart.h>
#include <soc/qcom/rpm-smd.h>
#include <soc/qcom/socinfo.h>
#include <soc/qcom/smd.h>
Loading