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

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

Merge "msm: move event_timer header to machine independent location"

parents a12cc966 0c623945

arch/arm/mach-msm/event_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/clockchips.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <mach/event_timer.h>

#include <soc/qcom/event_timer.h>



#define __INIT_HEAD(x)	{ .head = RB_ROOT,\

			.next = NULL, }

arch/arm/mach-msm/lpm_levels.c

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include <soc/qcom/rpm-notifier.h>

#include <soc/qcom/event_timer.h>

#include <mach/cpuidle.h>

#include <mach/event_timer.h>



#define SCLK_HZ (32768)

drivers/video/msm/mdp.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * MSM MDP Interface (used by framebuffer core)

 *

 * Copyright (c) 2007-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2007-2014, The Linux Foundation. All rights reserved.

 * Copyright (C) 2007 Google Incorporated

 *

 * This software is licensed under the terms of the GNU General Public
@@ -34,7 +34,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/semaphore.h>

#include <linux/uaccess.h>

#include <mach/event_timer.h>

#include <soc/qcom/event_timer.h>

#ifdef CONFIG_FB_MSM_MDP40

#endif

drivers/video/msm/mdss/mdss_mdp_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <soc/qcom/scm.h>



#include <linux/msm_iommu_domains.h>

#include <mach/event_timer.h>

#include <soc/qcom/event_timer.h>

#include <mach/msm_bus.h>

#include "mdss.h"

#include "mdss_debug.h"