beagle: only call DSS code when #defined CONFIG_VIDEO_OMAP3

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
This commit is contained in:
Peter Meerwald 2012-07-10 06:07:34 +00:00 committed by Albert ARIBAUD
parent 99b603e714
commit 2c30c18487

View File

@ -228,6 +228,7 @@ static unsigned int get_expansion_id(void)
return expansion_config.device_vendor; return expansion_config.device_vendor;
} }
#ifdef CONFIG_VIDEO_OMAP3
/* /*
* Configure DSS to display background color on DVID * Configure DSS to display background color on DVID
* Configure VENC to display color bar on S-Video * Configure VENC to display color bar on S-Video
@ -282,6 +283,7 @@ static void beagle_dvi_pup(void)
break; break;
} }
} }
#endif
/* /*
* Routine: misc_init_r * Routine: misc_init_r
@ -458,9 +460,11 @@ int misc_init_r(void)
dieid_num_r(); dieid_num_r();
#ifdef CONFIG_VIDEO_OMAP3
beagle_dvi_pup(); beagle_dvi_pup();
beagle_display_init(); beagle_display_init();
omap3_dss_enable(); omap3_dss_enable();
#endif
return 0; return 0;
} }