aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2011-02-22 11:03:53 +0100
committerJonas ABERG <jonas.aberg@stericsson.com>2011-02-22 11:05:02 +0100
commitef6a785f900ddd87a1a840921960eab3ef7417e1 (patch)
treec0e0c01a350a40e730d329a1c682c4e9f8fba2b8 /drivers/gpu
parentc8d6368b51cd14482c6cda1aa589bc577c339851 (diff)
Revert "drivers/gpu: Include mali through a symlink"
This reverts commit 20b3c9bd1c2cbc0be5cac7dd927787c5e107f78d. Dependencies to product common missed. Change-Id: I941c55e56264dac8a744dee6537249a8085b5537 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16663 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/Makefile3
-rw-r--r--drivers/gpu/mali/Kconfig7
-rw-r--r--drivers/gpu/mali/Makefile1
l---------drivers/gpu/mali/src1
4 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 44ae06a85b4..30879df3dae 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,4 +1 @@
obj-y += drm/ vga/
-ifeq ($(CONFIG_GPU_MALI), y)
- obj-$(CONFIG_GPU_MALI) += mali/
-endif
diff --git a/drivers/gpu/mali/Kconfig b/drivers/gpu/mali/Kconfig
deleted file mode 100644
index 978355d696f..00000000000
--- a/drivers/gpu/mali/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-config GPU_MALI
- tristate "ARM Mali 200/300/400 support"
- depends on ARM
- ---help---
- This enables support for the ARM Mali 200/300/400 family of GPUs.
- Platform specific configuration is made in configuration files in the
- drivers/gpu/mali/src folder
diff --git a/drivers/gpu/mali/Makefile b/drivers/gpu/mali/Makefile
deleted file mode 100644
index 79cfc8a5da2..00000000000
--- a/drivers/gpu/mali/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_GPU_MALI) += src/
diff --git a/drivers/gpu/mali/src b/drivers/gpu/mali/src
deleted file mode 120000
index bd5157f132d..00000000000
--- a/drivers/gpu/mali/src
+++ /dev/null
@@ -1 +0,0 @@
-../../../../vendor/st-ericsson/multimedia/linux/mali400ko/driver/src/devicedrv/mali/ \ No newline at end of file