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

Commit bff4f4b8 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Use correct paths for TRACE_INCLUDE_PATH"

parents e61a6e65 af5c6f5f

drivers/leds/leds-qpnp-flash-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static int qpnp_flash_led_strobe_config(struct qpnp_flash_led *led) 
	return rc;

}



static qpnp_flash_led_thermal_config(struct qpnp_flash_led *led)

static int qpnp_flash_led_thermal_config(struct qpnp_flash_led *led)

{

	int rc;

	u8 val, mask;

drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 */



#undef TRACE_SYSTEM
@@ -70,5 +70,5 @@ TRACE_EVENT( 


/* This part must be outside protection */

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_clients

#include <trace/define_trace.h>

drivers/platform/msm/ipa/ipa_v3/ipa_trace.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

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

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

 */



#undef TRACE_SYSTEM
@@ -179,5 +179,5 @@ TRACE_EVENT( 


/* This part must be outside protection */

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v3

#include <trace/define_trace.h>