diff options
| author | Angus Ainslie <angus.ainslie@linaro.org> | 2011-12-21 19:14:28 -0700 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-12-13 14:53:56 +0530 |
| commit | 027b57e93397bf0b014a99069fbe09a80cca9d44 (patch) | |
| tree | 09ea3fd70b1641a7e869898449441b635facef70 | |
| parent | 31afa391404b8152fa78207dc266d24c8f945407 (diff) | |
| download | linux-topics-027b57e93397bf0b014a99069fbe09a80cca9d44.tar.gz | |
arm: mali: update drivers for 3.2-rc6
These are build fixes for the 3.2-rc6 kernel
Signed-off-by: Angus Ainslie <angus.ainslie@linaro.org>
| -rwxr-xr-x | drivers/gpu/arm/mali/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/arm/mali/linux/mali_kernel_sysfs.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/arm/ump/linux/ump_kernel_linux.c | 2 | ||||
| -rw-r--r-- | 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 <linux/module.h> #include <linux/fs.h> #include <linux/device.h> #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 <linux/module.h> #include <linux/version.h> #include <linux/vermagic.h> #include "drmP.h" |