diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:44:14 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:44:14 +0200 |
| commit | 70526554173aa46c8b13a59992b6fbc555fd4ee0 (patch) | |
| tree | 21f0af1030935e2841b1427861905fef216e149f /drivers/gpu/mali/Makefile | |
| parent | 2ee8379b83e5afb57dd19192109380736c1c4431 (diff) | |
| parent | a613e39784b04863a3e885be0b21b5966b7ff174 (diff) | |
Merge branch 'mali-android' into stable-android-ux500-3.3-1
Diffstat (limited to 'drivers/gpu/mali/Makefile')
| -rw-r--r-- | drivers/gpu/mali/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 += ./ |