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

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

Merge "qseecom: Move qseecomi.h header file"

parents ee3c380f 6f35e338

arch/arm/mach-msm/tz_log.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2014, 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
@@ -23,7 +23,7 @@ 
#include <linux/types.h>

#include <linux/uaccess.h>

#include <soc/qcom/scm.h>

#include <mach/qseecomi.h>

#include <soc/qcom/qseecomi.h>



#define DEBUG_MAX_RW_BUF 4096

drivers/misc/qseecom.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <mach/board.h>

#include <linux/msm-bus.h>

#include <linux/msm-bus-board.h>

#include <mach/qseecomi.h>

#include <soc/qcom/qseecomi.h>

#include <asm/cacheflush.h>

#include "qseecom_legacy.h"

#include "qseecom_kernel.h"