diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-01-24 11:00:54 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-23 09:39:35 +0200 |
| commit | ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed (patch) | |
| tree | 648e81d8e824313c628d4d66d7960462acd9e834 | |
| parent | 5f1cc13fbf4cd0f798a08af2e0c04ae80ceac5e3 (diff) | |
| download | linux-3.10-ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed.tar.gz linux-3.10-ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed.tar.bz2 linux-3.10-ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed.zip | |
OMAPFB: remove remaining OMAP arch checks
Now that the old omapfb driver is only omap1 display driver, there's no
need to check if the arch is omap1. This patch removes the few remaining
checks for the arch.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | drivers/video/omap/Makefile | 6 | ||||
| -rw-r--r-- | drivers/video/omap/omapfb.h | 4 | ||||
| -rw-r--r-- | drivers/video/omap/omapfb_main.c | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index 79653750448..1927faffb5b 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile @@ -4,11 +4,9 @@ obj-$(CONFIG_FB_OMAP) += omapfb.o -objs-yy := omapfb_main.o +objs-yy := omapfb_main.o lcdc.o -objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o - -objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o +objs-y$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o diff --git a/drivers/video/omap/omapfb.h b/drivers/video/omap/omapfb.h index 07fe4987889..2921d20e4fb 100644 --- a/drivers/video/omap/omapfb.h +++ b/drivers/video/omap/omapfb.h @@ -47,11 +47,7 @@ struct omapfb_device; -#ifdef CONFIG_ARCH_OMAP1 #define OMAPFB_PLANE_NUM 1 -#else -#define OMAPFB_PLANE_NUM 3 -#endif struct omapfb_mem_region { u32 paddr; diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 3d2e1479821..f54b463709e 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -1741,8 +1741,7 @@ static int omapfb_do_probe(struct platform_device *pdev, #ifdef CONFIG_FB_OMAP_DMA_TUNE /* Set DMA priority for EMIFF access to highest */ - if (cpu_class_is_omap1()) - omap_set_dma_priority(0, OMAP_DMA_PORT_EMIFF, 15); + omap_set_dma_priority(0, OMAP_DMA_PORT_EMIFF, 15); #endif r = ctrl_change_mode(fbdev->fb_info[0]); |