diff options
| author | chenzhen <chenzhen@rock-chips.com> | 2016-04-05 16:53:38 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2016-05-31 09:11:11 +0800 |
| commit | 3adc6eb16b2bdfb47fa83e8608ee11b25b6c2908 (patch) | |
| tree | ddecc1c5a66391824bfc866c19fd6037ebd662dd /drivers/gpu/arm/midgard/mali_linux_trace.h | |
| parent | 206f372edef1825b246043ee114097e28130739c (diff) | |
MALI: rockchip: upgrade midgard DDK to r11p0-00rel0
Conflicts:
drivers/gpu/arm/midgard/mali_kbase_core_linux.c
drivers/gpu/arm/midgard/mali_kbase_jd.c
Change-Id: I9c910f2b08ffd2e9101fbe85958030ac7bca1642
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/mali_linux_trace.h')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_linux_trace.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/arm/midgard/mali_linux_trace.h b/drivers/gpu/arm/midgard/mali_linux_trace.h index fc3cf32ba4d2..93fc5eaf273b 100644 --- a/drivers/gpu/arm/midgard/mali_linux_trace.h +++ b/drivers/gpu/arm/midgard/mali_linux_trace.h @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2011-2015 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -15,19 +15,15 @@ - - #if !defined(_TRACE_MALI_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_MALI_H -#include <linux/stringify.h> -#include <linux/tracepoint.h> - #undef TRACE_SYSTEM #define TRACE_SYSTEM mali -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) #define TRACE_INCLUDE_FILE mali_linux_trace +#include <linux/tracepoint.h> + #define MALI_JOB_SLOTS_EVENT_CHANGED /** |