diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 23:00:49 +0100 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-12-17 23:00:49 +0100 |
| commit | a4581b35e1bc80becf240238bc787a5ec2727db0 (patch) | |
| tree | 34cbf36101639403a766e74deb36e7015d871b39 /include/video | |
| parent | video: s3c2410: fix checkpatch error and warnings (diff) | |
| parent | Linux 3.2-rc6 (diff) | |
| download | linux-a4581b35e1bc80becf240238bc787a5ec2727db0.tar.xz linux-a4581b35e1bc80becf240238bc787a5ec2727db0.zip | |
Merge commit 'v3.2-rc6' into fbdev-next
Diffstat (limited to 'include/video')
| -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; |