diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-11-24 15:58:01 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 15:58:01 +0000 |
| commit | 55135dfbf3dd83cb3e98deed8271b62d188404e1 (patch) | |
| tree | ff9fc0b1f8c4b7901ffec8c3ed6c1cf069687ab3 /include | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes (diff) | |
| parent | Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss (diff) | |
| download | linux-dev-55135dfbf3dd83cb3e98deed8271b62d188404e1.tar.xz linux-dev-55135dfbf3dd83cb3e98deed8271b62d188404e1.zip | |
Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
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 b66ebb2032c6..378c7ed6760b 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; |