From 7653853c08f7850aa229a363a23399f9a7495306 Mon Sep 17 00:00:00 2001 From: Rhyland Klein Date: Thu, 12 Jul 2012 09:51:54 -0700 Subject: video: tegra: fix compilation warning Without the CONFIG_SWITCH enabled, there are multiple unused variable warnings that get treated as error. bug 949219 Signed-off-by: Rhyland Klein Change-Id: I39512367fa4bbd3b00a435d0d7a31cfede9e712f Reviewed-on: http://git-master/r/115428 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani Reviewed-by: Sanjay Singh Rawat --- drivers/video/tegra/dc/hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 0795ef8ea6d2..79478ea48f83 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -1499,10 +1499,10 @@ static void tegra_dc_hdmi_resume(struct tegra_dc *dc) tegra_nvhdcp_resume(hdmi->nvhdcp); } +#ifdef CONFIG_SWITCH static ssize_t underscan_show(struct device *dev, struct device_attribute *attr, char *buf) { -#ifdef CONFIG_SWITCH struct tegra_dc_hdmi_data *hdmi = container_of(dev_get_drvdata(dev), struct tegra_dc_hdmi_data, hpd_switch); @@ -1510,19 +1510,19 @@ static ssize_t underscan_show(struct device *dev, return sprintf(buf, "%d\n", tegra_edid_underscan_supported(hdmi->edid)); else return 0; -#else - return 0; -#endif } static DEVICE_ATTR(underscan, S_IRUGO | S_IWUSR, underscan_show, NULL); +#endif static int tegra_dc_hdmi_init(struct tegra_dc *dc) { struct tegra_dc_hdmi_data *hdmi; struct resource *res; struct resource *base_res; +#ifdef CONFIG_SWITCH int ret; +#endif void __iomem *base; struct clk *clk = NULL; struct clk *disp1_clk = NULL; -- cgit v1.2.3