From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755891AbcFTPzJ (ORCPT ); Mon, 20 Jun 2016 11:55:09 -0400 Received: from mail-yw0-f196.google.com ([209.85.161.196]:35153 "EHLO mail-yw0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755838AbcFTPy2 (ORCPT ); Mon, 20 Jun 2016 11:54:28 -0400 From: Gustavo Padovan To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, Daniel Stone , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Maarten Lankhorst , Sumit Semwal , Gustavo Padovan Subject: [PATCH 4/7] staging/android: move trace/sync.h to sync_trace.h Date: Mon, 20 Jun 2016 12:53:10 -0300 Message-Id: <1466437993-21573-5-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466437993-21573-1-git-send-email-gustavo@padovan.org> References: <1466437993-21573-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gustavo Padovan The common behaviour for trace headers is to have them in the same folder they are used, instead of creating a special trace/ directory. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sw_sync.c | 2 +- drivers/staging/android/{trace/sync.h => sync_trace.h} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename drivers/staging/android/{trace/sync.h => sync_trace.h} (84%) diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index 66837ca..25196f5 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -23,7 +23,7 @@ #include "sync_debug.h" #define CREATE_TRACE_POINTS -#include "trace/sync.h" +#include "sync_trace.h" struct sw_sync_create_fence_data { __u32 value; diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/sync_trace.h similarity index 84% rename from drivers/staging/android/trace/sync.h rename to drivers/staging/android/sync_trace.h index 6b5ce96..ea485f7 100644 --- a/drivers/staging/android/trace/sync.h +++ b/drivers/staging/android/sync_trace.h @@ -1,11 +1,11 @@ #undef TRACE_SYSTEM -#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace -#define TRACE_SYSTEM sync +#define TRACE_INCLUDE_PATH ../../drivers/staging/android +#define TRACE_SYSTEM sync_trace #if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYNC_H -#include "../sync_debug.h" +#include "sync_debug.h" #include TRACE_EVENT(sync_timeline, -- 2.5.5