summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMayuresh Janorkar <mayur@ti.com>2010-08-16 12:57:25 +0530
committerSamreen <samreen@ti.com>2010-08-16 17:29:01 +0530
commitd89e95de3d5ab547bdd25b25c95e010162a564ef (patch)
treeb575bc68b4ce1af5e4343ac59cf4b334dbbe7c5b /drivers
parentb051edb8032b0641d1e63304fdafb634540439b6 (diff)
Fixing warnings in core.c
This patch would fix build warnings seen in building drivers/video/omap2/dss/core.c file Signed-off-by: Mayuresh Janorkar <mayur@ti.com>
Diffstat (limited to 'drivers')
-rwxr-xr-xdrivers/video/omap2/dss/core.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index a4400c7680c8..00f68cb5f293 100755
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -55,11 +55,12 @@ static struct {
struct regulator *vdda_dac_reg;
struct omap_dss_board_info *pdata;
} core;
-
+#ifdef HWMOD
static void dss_clk_enable_all_no_ctx(void);
static void dss_clk_disable_all_no_ctx(void);
static void dss_clk_enable_no_ctx(enum dss_clock clks);
static void dss_clk_disable_no_ctx(enum dss_clock clks);
+#endif
static char *def_disp_name;
module_param_named(def_disp, def_disp_name, charp, 0);
@@ -350,26 +351,6 @@ static void dss_put_clocks(void)
{
return;
}
-
-static void dss_clk_enable_no_ctx(enum dss_clock clks)
-{
- return;
-}
-
-static void dss_clk_disable_no_ctx(enum dss_clock clks)
-{
- return;
-}
-
-static void dss_clk_enable_all_no_ctx()
-{
- return;
-}
-
-static void dss_clk_disable_all_no_ctx()
-{
- return;
-}
#endif
/* REGULATORS */
@@ -631,11 +612,11 @@ static int omap_dss_probe(struct platform_device *pdev)
err_register:
dss_uninitialize_debugfs();
err_debugfs:
+#ifdef HWMOD
#ifdef CONFIG_OMAP2_DSS_HDMI
hdmi_exit();
err_hdmi:
#endif
-#ifdef HWMOD
if (cpu_is_omap44xx())
dsi2_exit();
err_dsi2: