diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:57:37 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:57:37 -0800 |
| commit | b079d671f88322733010082a590f59885eafd62e (patch) | |
| tree | 6e824cdc1f62da9516ebc2f851229b6535a33028 /include | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
| parent | b923d40dd4211c4ef7d4efa2bd81b7ca1d8744c1 (diff) | |
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/omapdss.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index b66ebb2032c..378c7ed6760 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -307,15 +307,8 @@ struct omap_dss_board_info { void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask); }; -#if defined(CONFIG_OMAP2_DSS_MODULE) || defined(CONFIG_OMAP2_DSS) /* Init with the board info */ extern int omap_display_init(struct omap_dss_board_info *board_data); -#else -static inline int omap_display_init(struct omap_dss_board_info *board_data) -{ - return 0; -} -#endif struct omap_display_platform_data { struct omap_dss_board_info *board_data; |