diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:43:53 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 15:43:53 +0100 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /include/video/omapdss.h | |
| parent | gma500: Final enables for Oaktrail (diff) | |
| parent | Linux 3.2-rc6 (diff) | |
| download | linux-1fbe6f625f69e48c4001051dc1431afc704acfaa.tar.xz linux-1fbe6f625f69e48c4001051dc1431afc704acfaa.zip | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'include/video/omapdss.h')
| -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; |