diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-10 09:02:02 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-10 12:11:17 +0100 |
| commit | 15ce78dafc08b1c5c3ec8f42070ae37160b5154c (patch) | |
| tree | cdb25c6758ac3fe5ac6f9e151642a4779e2fc742 /drivers/gator/gator_events_mali_t6xx_hw.c | |
| parent | 34d9769988397a1edf93ad1966c167591ab29e79 (diff) | |
gator: Version 5.18
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'drivers/gator/gator_events_mali_t6xx_hw.c')
| -rw-r--r-- | drivers/gator/gator_events_mali_t6xx_hw.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gator/gator_events_mali_t6xx_hw.c b/drivers/gator/gator_events_mali_t6xx_hw.c index e406991398d..dfbc91ffd76 100644 --- a/drivers/gator/gator_events_mali_t6xx_hw.c +++ b/drivers/gator/gator_events_mali_t6xx_hw.c @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2012-2013. All rights reserved. + * Copyright (C) ARM Limited 2012-2014. 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 as @@ -16,9 +16,17 @@ #include <asm/io.h> /* Mali T6xx DDK includes */ +#ifdef MALI_DIR_MIDGARD +/* New DDK Directory structure with kernel/drivers/gpu/arm/midgard*/ +#include "mali_linux_trace.h" +#include "mali_kbase.h" +#include "mali_kbase_mem_linux.h" +#else +/* Old DDK Directory structure with kernel/drivers/gpu/arm/t6xx*/ #include "linux/mali_linux_trace.h" #include "kbase/src/common/mali_kbase.h" #include "kbase/src/linux/mali_kbase_mem_linux.h" +#endif #include "gator_events_mali_common.h" |