From 027b57e93397bf0b014a99069fbe09a80cca9d44 Mon Sep 17 00:00:00 2001 From: Angus Ainslie Date: Wed, 21 Dec 2011 19:14:28 -0700 Subject: arm: mali: update drivers for 3.2-rc6 These are build fixes for the 3.2-rc6 kernel Signed-off-by: Angus Ainslie --- drivers/gpu/arm/mali/Makefile | 2 +- drivers/gpu/arm/mali/linux/mali_kernel_sysfs.c | 1 + drivers/gpu/arm/ump/linux/ump_kernel_linux.c | 2 +- drivers/gpu/drm/mali/mali_drv.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile index d4f009aee84..fd45d0fa75f 100755 --- a/drivers/gpu/arm/mali/Makefile +++ b/drivers/gpu/arm/mali/Makefile @@ -15,7 +15,7 @@ KBUILDROOT = # Add platform configuration file for Mali ifeq ($(CONFIG_ARCH_EXYNOS4),y) -MACHDIR := $(srctree)/arch/arm/mach-exynos4 +MACHDIR := $(srctree)/arch/arm/mach-exynos MALICONFIGDIR :=$(MACHDIR)/include/mach/mali endif diff --git a/drivers/gpu/arm/mali/linux/mali_kernel_sysfs.c b/drivers/gpu/arm/mali/linux/mali_kernel_sysfs.c index 60c77a7a359..5e2167e96f9 100644 --- a/drivers/gpu/arm/mali/linux/mali_kernel_sysfs.c +++ b/drivers/gpu/arm/mali/linux/mali_kernel_sysfs.c @@ -14,6 +14,7 @@ * Implementation of some sysfs data exports */ +#include #include #include #include "mali_kernel_license.h" diff --git a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c index 4845818d6d9..9f8b808ccff 100644 --- a/drivers/gpu/arm/ump/linux/ump_kernel_linux.c +++ b/drivers/gpu/arm/ump/linux/ump_kernel_linux.c @@ -27,7 +27,7 @@ #include "ump_kernel_memory_backend.h" #include "ump_kernel_memory_backend_os.h" #include "ump_kernel_memory_backend_dedicated.h" -#include "ump_kernel_license.h" +#include "license/gpl/ump_kernel_license.h" #include "ump_osk.h" #include "ump_ukk.h" diff --git a/drivers/gpu/drm/mali/mali_drv.c b/drivers/gpu/drm/mali/mali_drv.c index 1bc76e98d6b..e914c1cd4c7 100644 --- a/drivers/gpu/drm/mali/mali_drv.c +++ b/drivers/gpu/drm/mali/mali_drv.c @@ -12,6 +12,7 @@ * @file mali_drv.c * Implementation of the Linux device driver entrypoints for Mali DRM */ +#include #include #include #include "drmP.h" -- cgit v1.2.3