From 20186f288399636214e4e1dbc5f05fc04090e4f3 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Tue, 17 Apr 2018 12:01:45 -0500 Subject: [PATCH] UBUNTU: SAUCE: (no-up) rename the adv7511 drm driver to adv7511_drm BugLink: http://bugs.launchpad.net/bugs/1764816 This has the same name as another module, and due to some quirk only one of them will get installed. Which one it is seems to be nondeterministic, but if the drm module is missing in our snapdragon flavor then the display and audio will fail to work. Rename the module to avoid the duplication. Acked-by: Colin Ian King Acked-by: Thadeu Lima de Souza Cascardo Signed-off-by: Seth Forshee --- drivers/gpu/drm/bridge/adv7511/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile index 5bb384938a71..559e4e96a83a 100644 --- a/drivers/gpu/drm/bridge/adv7511/Makefile +++ b/drivers/gpu/drm/bridge/adv7511/Makefile @@ -1,5 +1,5 @@ -adv7511-y := adv7511_drv.o -adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o -adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o -adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o -obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o +adv7511_drm-y := adv7511_drv.o +adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o +adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o +adv7511_drm-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o +obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511_drm.o -- 2.39.2