aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-05-02 11:16:08 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-16 18:37:50 -0400
commitfcce768067ae5f397ab5f96e2e471b9ba6a4bf96 (patch)
treee44537b5116817dad441e6fb478601c216dc1c1a
parenta5017b962059f7cec8f6d2dfb286ef3fbfbaab82 (diff)
staging/drm: imx: add missing dependencies
The imx DRM driver needs a couple of extra Kconfig dependencies to avoid random build failures: drivers/staging/imx-drm/ipuv3-crtc.c:448: undefined reference to `ipu_idmac_put' drivers/staging/imx-drm/ipuv3-crtc.c:450: undefined reference to `ipu_dmfc_put' drivers/staging/imx-drm/ipuv3-crtc.c:452: undefined reference to `ipu_dp_put' drivers/staging/imx-drm/ipuv3-crtc.c:454: undefined reference to `ipu_di_put' drivers/built-in.o: In function `ipu_probe': :(.text+0x4b4174): undefined reference to `device_reset' drivers/built-in.o: In function `imx_tve_probe': drivers/staging/imx-drm/imx-tve.c:648: undefined reference to `devm_regmap_init_mmio_clk' drivers/built-in.o: In function `imx_pd_connector_get_modes': drivers/staging/imx-drm/parallel-display.c:78: undefined reference to `of_get_drm_display_mode' Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/imx-drm/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/Kconfig b/drivers/staging/imx-drm/Kconfig
index 8c9e40390f42..35ccda56fc2a 100644
--- a/drivers/staging/imx-drm/Kconfig
+++ b/drivers/staging/imx-drm/Kconfig
@@ -1,6 +1,7 @@
1config DRM_IMX 1config DRM_IMX
2 tristate "DRM Support for Freescale i.MX" 2 tristate "DRM Support for Freescale i.MX"
3 select DRM_KMS_HELPER 3 select DRM_KMS_HELPER
4 select VIDEOMODE_HELPERS
4 select DRM_GEM_CMA_HELPER 5 select DRM_GEM_CMA_HELPER
5 select DRM_KMS_CMA_HELPER 6 select DRM_KMS_CMA_HELPER
6 depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM) 7 depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM)
@@ -23,6 +24,7 @@ config DRM_IMX_PARALLEL_DISPLAY
23config DRM_IMX_TVE 24config DRM_IMX_TVE
24 tristate "Support for TV and VGA displays" 25 tristate "Support for TV and VGA displays"
25 depends on DRM_IMX 26 depends on DRM_IMX
27 select REGMAP_MMIO
26 help 28 help
27 Choose this to enable the internal Television Encoder (TVe) 29 Choose this to enable the internal Television Encoder (TVe)
28 found on i.MX53 processors. 30 found on i.MX53 processors.
@@ -30,6 +32,7 @@ config DRM_IMX_TVE
30config DRM_IMX_IPUV3_CORE 32config DRM_IMX_IPUV3_CORE
31 tristate "IPUv3 core support" 33 tristate "IPUv3 core support"
32 depends on DRM_IMX 34 depends on DRM_IMX
35 depends on RESET_CONTROLLER
33 help 36 help
34 Choose this if you have a i.MX5/6 system and want 37 Choose this if you have a i.MX5/6 system and want
35 to use the IPU. This option only enables IPU base 38 to use the IPU. This option only enables IPU base
@@ -38,5 +41,6 @@ config DRM_IMX_IPUV3_CORE
38config DRM_IMX_IPUV3 41config DRM_IMX_IPUV3
39 tristate "DRM Support for i.MX IPUv3" 42 tristate "DRM Support for i.MX IPUv3"
40 depends on DRM_IMX 43 depends on DRM_IMX
44 depends on DRM_IMX_IPUV3_CORE
41 help 45 help
42 Choose this if you have a i.MX5 or i.MX6 processor. 46 Choose this if you have a i.MX5 or i.MX6 processor.