diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-09 19:24:58 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 11:07:46 +0200 |
| commit | 35b522cfb00fae5d8d744fb2c50fc96c94592d44 (patch) | |
| tree | b3488ae2333428338705b9f9c70f336f77922210 /drivers/video/fbdev/omap2/omapfb/dss/dss.h | |
| parent | fc6caa0b5b9b234fc9efff4342956d5d06112137 (diff) | |
| download | talos-op-linux-35b522cfb00fae5d8d744fb2c50fc96c94592d44.tar.gz talos-op-linux-35b522cfb00fae5d8d744fb2c50fc96c94592d44.zip | |
omapfb/dss: change CONFIG_OMAP* to CONFIG_FB_OMAP*
We need to change the config symbols of omapfb's private copy of
omapdss so that we won't have config symbol conflicts.
This patch changes the symbols from omapdss using simple replacement of
CONFIG_OMAP* to CONFIG_FB_OMAP*.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/video/fbdev/omap2/omapfb/dss/dss.h')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dss.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.h b/drivers/video/fbdev/omap2/omapfb/dss/dss.h index 9a6453235585..b9066afee301 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h @@ -278,7 +278,7 @@ void dss_video_pll_uninit(struct dss_pll *pll); struct device_node *dss_of_port_get_parent_device(struct device_node *port); u32 dss_of_port_get_port_number(struct device_node *port); -#if defined(CONFIG_OMAP2_DSS_DEBUGFS) +#if defined(CONFIG_FB_OMAP2_DSS_DEBUGFS) void dss_debug_dump_clocks(struct seq_file *s); #endif @@ -311,7 +311,7 @@ bool dss_div_calc(unsigned long pck, unsigned long fck_min, int sdi_init_platform_driver(void) __init; void sdi_uninit_platform_driver(void); -#ifdef CONFIG_OMAP2_DSS_SDI +#ifdef CONFIG_FB_OMAP2_DSS_SDI int sdi_init_port(struct platform_device *pdev, struct device_node *port); void sdi_uninit_port(struct device_node *port); #else @@ -327,7 +327,7 @@ static inline void sdi_uninit_port(struct device_node *port) /* DSI */ -#ifdef CONFIG_OMAP2_DSS_DSI +#ifdef CONFIG_FB_OMAP2_DSS_DSI struct dentry; struct file_operations; @@ -353,7 +353,7 @@ static inline u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt) int dpi_init_platform_driver(void) __init; void dpi_uninit_platform_driver(void); -#ifdef CONFIG_OMAP2_DSS_DPI +#ifdef CONFIG_FB_OMAP2_DSS_DPI int dpi_init_port(struct platform_device *pdev, struct device_node *port); void dpi_uninit_port(struct device_node *port); #else @@ -428,7 +428,7 @@ int rfbi_init_platform_driver(void) __init; void rfbi_uninit_platform_driver(void); -#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS +#ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr) { int b; |
