From: Tomi Valkeinen Date: Wed, 14 Mar 2018 08:24:43 +0000 (+0200) Subject: drm/omap: fix compile error when DPI is disabled X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=037f03155b7d87e85168b4296516bfda5c9f6380;p=linux.git drm/omap: fix compile error when DPI is disabled When CONFIG_OMAP2_DSS_DPI is disabled, compilation fails due to: drivers/gpu/drm/omapdrm/dss/dss.h:388:25: error: conflicting types for ‘port’ struct device_node *port, ^~~~ Fix this by renaming the first parameter correctly. Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h index c601ed9a09c20..847c78ade024d 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.h +++ b/drivers/gpu/drm/omapdrm/dss/dss.h @@ -383,7 +383,7 @@ int dpi_init_port(struct dss_device *dss, struct platform_device *pdev, struct device_node *port, enum dss_model dss_model); void dpi_uninit_port(struct device_node *port); #else -static inline int dpi_init_port(struct dss_device *port, +static inline int dpi_init_port(struct dss_device *dss, struct platform_device *pdev, struct device_node *port, enum dss_model dss_model)