summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2011-12-14 05:01:03 +0000
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2011-12-14 08:53:56 -0700
commit1442c02caa39cda9311783fdd6685f7e2e5c8062 (patch)
tree3886a6c03bd280d955bce3585028099c5894de95
parentb8a8f4bd2720884ae41fa3601793882a2b9401e8 (diff)
snowball: android: Add "CONFIG_MALI_DRM" config2011.12
This config will help to selectively enable/disable drm support in the kernel Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--drivers/gpu/mali/Kconfig7
-rw-r--r--drivers/gpu/mali/Makefile2
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/mali/Kconfig b/drivers/gpu/mali/Kconfig
index 0781bcbd854..bc2cc660bc3 100644
--- a/drivers/gpu/mali/Kconfig
+++ b/drivers/gpu/mali/Kconfig
@@ -13,3 +13,10 @@ config GPU_MALI_DEBUG
---help---
This enables debug prints in the mali device driver. Debug mode must be
enabled in order to use the intrumentation feature of the mali libraries.
+
+config MALI_DRM
+ boolean "DRM driver for Mali"
+ default n
+ depends on GPU_MALI
+ ---help---
+ This enables the DRM driver for Mali GPU.
diff --git a/drivers/gpu/mali/Makefile b/drivers/gpu/mali/Makefile
index 93c95aca19a..698dcb0e590 100644
--- a/drivers/gpu/mali/Makefile
+++ b/drivers/gpu/mali/Makefile
@@ -3,7 +3,7 @@ MALIDRM_SUBFOLDER := mali400ko/x11/mali_drm/mali
MALI_FOLDER := $(srctree)/$(src)/$(MALI_SUBFOLDER)
ifeq ($(shell [ -d $(MALI_FOLDER) ] && echo "OK"), OK)
obj-$(CONFIG_GPU_MALI) += $(MALI_SUBFOLDER)/
-obj-y += $(MALIDRM_SUBFOLDER)/
+obj-$(CONFIG_MALI_DRM) += $(MALIDRM_SUBFOLDER)/
else
$(warning WARNING: mali: Could not find $(MALI_FOLDER) - mali device driver will not be built)
obj-n += ./