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

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

Merge "msm: avs: Move avs header to include/mach"

parents 881dca72 7ab2ce8c

arch/arm/mach-msm/avs.c

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

#include <linux/kernel.h>

#include <asm/cputype.h>

#include "avs.h"

#include <mach/avs.h>

#include "spm.h"



u32 avs_get_avscsr(void)

arch/arm/mach-msm/clock-krait.c

+1 −1
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
#include <linux/clk/msm-clk-provider.h>

#include <linux/clk/msm-clk.h>

#include <linux/clk/msm-clock-generic.h>

#include <mach/avs.h>



#include <linux/clk.h>

#include <mach/msm-krait-l2-accessors.h>

#include "clock-krait.h"

#include "avs.h"



static DEFINE_SPINLOCK(kpss_clock_reg_lock);

arch/arm/mach-msm/avs.h→arch/arm/mach-msm/include/mach/avs.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2009,2012, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

arch/arm/mach-msm/pm-8x60.c

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/of_platform.h>

#include <linux/regulator/krait-regulator.h>

#include <linux/cpu.h>

#include <mach/avs.h>

#include <mach/socinfo.h>

#include <mach/scm.h>

#include <mach/socinfo.h>
@@ -53,7 +54,6 @@ 
#include <asm/vfp.h>

#endif

#include "clock.h"

#include "avs.h"

#include <mach/cpuidle.h>

#include "idle.h"

#include "pm.h"