diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 19:23:47 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-07-23 21:01:17 +0400 |
| commit | bba2626886ca6fc5430d9d44a2976d1d50b90482 (patch) | |
| tree | 580f2b5b744b1bdbcf793ce4e90fbc34a7e3ea32 | |
| parent | 9143c83a7e094300c9116879b6494c98df01526f (diff) | |
drivers/gpu/arm/mali, drivers/gpu/arm/ump: s/mach/mach-exynos
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rwxr-xr-x | drivers/gpu/arm/mali/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/arm/mali/linux/mali_osk_mali.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/arm/ump/linux/ump_kernel_linux.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/arm/ump/linux/ump_memory_backend.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile index 263e076a4a9a..b4a9e259fd62 100755 --- a/drivers/gpu/arm/mali/Makefile +++ b/drivers/gpu/arm/mali/Makefile @@ -18,7 +18,7 @@ KBUILDROOT = # Add platform configuration file for Mali #ifeq ($(CONFIG_ARCH_EXYNOS4),y) MACHDIR := $(srctree)/arch/arm/mach-exynos -MALICONFIGDIR :=$(MACHDIR)/include/mach/mali +MALICONFIGDIR :=$(MACHDIR)/include/mach-exynos/mali #endif USING_DED=0 diff --git a/drivers/gpu/arm/mali/linux/mali_osk_mali.c b/drivers/gpu/arm/mali/linux/mali_osk_mali.c index 06a27bc4f917..591430c123c0 100644 --- a/drivers/gpu/arm/mali/linux/mali_osk_mali.c +++ b/drivers/gpu/arm/mali/linux/mali_osk_mali.c @@ -19,8 +19,8 @@ #include "mali_osk.h" /* kernel side OS functions */ #include "mali_uk_types.h" #include "mali_kernel_linux.h" /* exports initialize/terminate_kernel_device() definition of mali_osk_low_level_mem_init() and term */ -#include <mach/irqs.h> -#include <mach/mali/config.h> /* contains the configuration of the arch we are compiling for */ +#include <mach-exynos/irqs.h> +#include <mach-exynos/mali/config.h> /* contains the configuration of the arch we are compiling for */ /* is called from mali_kernel_constructor in common code */ _mali_osk_errcode_t _mali_osk_init( void ) diff --git a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c index 04a55ab6185c..5bc06513b4b0 100644 --- a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c +++ b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c @@ -18,7 +18,7 @@ #include <linux/device.h> #include <linux/debugfs.h> -#include <mach/ump/config.h> /* Configuration for current platform. The symlinc for arch is set by Makefile */ +#include <mach-exynos/ump/config.h> /* Configuration for current platform. The symlinc for arch is set by Makefile */ #include "ump_ioctl.h" #include "ump_kernel_common.h" #include "ump_kernel_interface.h" diff --git a/drivers/gpu/arm/ump/linux/ump_memory_backend.c b/drivers/gpu/arm/ump/linux/ump_memory_backend.c index d4444cad7e14..1e5e3cc9373d 100644 --- a/drivers/gpu/arm/ump/linux/ump_memory_backend.c +++ b/drivers/gpu/arm/ump/linux/ump_memory_backend.c @@ -11,7 +11,7 @@ #include <linux/module.h> /* kernel module definitions */ #include <linux/ioport.h> /* request_mem_region */ -#include <mach/ump/config.h> /* Configuration for current platform. The symlink for arch is set by Makefile */ +#include <mach-exynos/ump/config.h> /* Configuration for current platform. The symlink for arch is set by Makefile */ #include "ump_osk.h" #include "ump_kernel_common.h" |