diff --git a/msm/Android.mk b/msm/Android.mk index 753447660a..c51e885b7c 100644 --- a/msm/Android.mk +++ b/msm/Android.mk @@ -23,6 +23,8 @@ KBUILD_OPTIONS += MODNAME=msm_drm KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(DISPLAY_SELECT) +KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(shell pwd)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers + ########################################################### include $(CLEAR_VARS) LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*) @@ -31,6 +33,10 @@ LOCAL_MODULE_KBUILD_NAME := msm_drm.ko LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) + +LOCAL_REQUIRED_MODULES := mmrm-module-symvers +LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers + include $(DLKM_DIR)/Build_external_kernelmodule.mk ########################################################### endif # DLKM check diff --git a/msm/Kbuild b/msm/Kbuild index af948f24df..b9fd81c8df 100644 --- a/msm/Kbuild +++ b/msm/Kbuild @@ -7,6 +7,8 @@ ifeq ($(CONFIG_ARCH_WAIPIO), y) LINUX_INC += -include $(DISPLAY_ROOT)/config/gki_waipiodispconf.h endif +KBUILD_CPPFLAGS += -DCONFIG_MSM_MMRM=1 + LINUX_INC += -Iinclude/linux \ -Iinclude/linux/drm diff --git a/msm/msm_drv.c b/msm/msm_drv.c index ede9d2bca7..5b5ecafccf 100644 --- a/msm/msm_drv.c +++ b/msm/msm_drv.c @@ -2163,6 +2163,7 @@ static void __exit msm_drm_unregister(void) module_init(msm_drm_register); module_exit(msm_drm_unregister); +MODULE_SOFTDEP("pre: msm-mmrm"); MODULE_AUTHOR("Rob Clark