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

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

Merge "msm: clock-generic: Move the clock-generic header to include/linux/clk"

parents dcb631bb 6d98f57e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@
#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/regulator/consumer.h>
#include <linux/clk/msm-clock-generic.h>

#include <mach/rpm-regulator-smd.h>
#include <mach/socinfo.h>
#include <mach/rpm-smd.h>
#include <mach/clock-generic.h>

#include "clock-local2.h"
#include "clock-pll.h"
+1 −1
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@
#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/regulator/consumer.h>
#include <linux/clk/msm-clock-generic.h>

#include <mach/rpm-regulator-smd.h>
#include <mach/socinfo.h>
#include <mach/rpm-smd.h>
#include <mach/clock-generic.h>

#include "clock-local2.h"
#include "clock-pll.h"
+1 −1
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@
#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/regulator/consumer.h>
#include <linux/clk/msm-clock-generic.h>

#include <mach/rpm-regulator-smd.h>
#include <mach/socinfo.h>
#include <mach/rpm-smd.h>
#include <mach/clock-generic.h>

#include "clock-local2.h"
#include "clock-pll.h"
+1 −1
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@
#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/regulator/consumer.h>
#include <linux/clk/msm-clock-generic.h>

#include <mach/rpm-regulator-smd.h>
#include <mach/socinfo.h>
#include <mach/rpm-smd.h>
#include <mach/clock-generic.h>

#include "clock-local2.h"
#include "clock-pll.h"
+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
#include <linux/of.h>
#include <linux/clk/msm-clock-generic.h>

#include <mach/clock-generic.h>
#include "clock-local2.h"

#define UPDATE_CHECK_MAX_LOOPS 200
Loading