summaryrefslogtreecommitdiffstats
path: root/include/video/omapdss.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2012-01-11 20:11:29 +0100
committerPekka Enberg <penberg@kernel.org>2012-01-11 20:11:29 +0100
commit5878cf431ca7233a56819ca6970153ac0b129599 (patch)
treee5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /include/video/omapdss.h
parentslub: disallow changing cpu_partial from userspace for debug caches (diff)
parentslub: add missed accounting (diff)
downloadlinux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz
linux-5878cf431ca7233a56819ca6970153ac0b129599.zip
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'include/video/omapdss.h')
-rw-r--r--include/video/omapdss.h7
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;