diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-23 12:06:28 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-23 12:06:28 -0800 |
| commit | 7cab8713b1ed0dab08ad6458f92a40b7ff4be619 (patch) | |
| tree | 8c95691ac2b5bdfc85efe417427b5903fa80450c /arch/arm/plat-omap/include/plat/display.h | |
| parent | c3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5 (diff) | |
| parent | d5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 (diff) | |
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
Diffstat (limited to 'arch/arm/plat-omap/include/plat/display.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/display.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h index 537f4e449f50..0f140ecedb01 100644 --- a/arch/arm/plat-omap/include/plat/display.h +++ b/arch/arm/plat-omap/include/plat/display.h @@ -23,6 +23,7 @@ #include <linux/list.h> #include <linux/kobject.h> #include <linux/device.h> +#include <linux/platform_device.h> #include <asm/atomic.h> #define DISPC_IRQ_FRAMEDONE (1 << 0) @@ -226,6 +227,16 @@ struct omap_dss_board_info { struct omap_dss_device *default_device; }; +#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_video_timings { /* Unit: pixels */ u16 x_res; |