[PATCH 07/17] DRM/KMS/EDID: Move drm_edid_load.o to drm.ko

[Takashi Iwai]

At Mon, 19 Nov 2012 15:23:08 -0500,
"Egbert Eich " <"eich at novell.com> wrote:
> 
> EDIDs are an integral concept of connectors, connectors are a concept
> of drm core also drm_edid.o is already part of this drm core.
> Overridden, 'firmware-supplied' EDIDs should be treated exactly the
> same as device supplied ones.
> Therefore move drm_edid_load from the helper level to the drm core.
> 
> Signed-off-by: Egbert Eich <eich at suse.de>

You need to fix Kconfig as well.
And I think the dependency on CONFIG_FW_LOADER is missing there, too.
It should have "select FW_LOADER".


Takashi

> ---
>  drivers/gpu/drm/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index 2ff5cef..76ca269 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -16,11 +16,11 @@ drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
>  
>  drm-$(CONFIG_COMPAT) += drm_ioc32.o
>  drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
> +drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
>  
>  drm-usb-y   := drm_usb.o
>  
>  drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_i2c_helper.o
> -drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
>  drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
>  
>  obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
> -- 
> 1.7.7
>