diff --git a/[refs] b/[refs]
index 50b1b36ae191..b10cddcbf8c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f1cc13fbf4cd0f798a08af2e0c04ae80ceac5e3
+refs/heads/master: ae7e1f2d0b9cf37d4ca4d55b264110e4c880f7ed
diff --git a/trunk/drivers/video/omap/Makefile b/trunk/drivers/video/omap/Makefile
index 79653750448a..1927faffb5bc 100644
--- a/trunk/drivers/video/omap/Makefile
+++ b/trunk/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/trunk/drivers/video/omap/omapfb.h b/trunk/drivers/video/omap/omapfb.h
index 07fe49878892..2921d20e4fba 100644
--- a/trunk/drivers/video/omap/omapfb.h
+++ b/trunk/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/trunk/drivers/video/omap/omapfb_main.c b/trunk/drivers/video/omap/omapfb_main.c
index 3d2e14798210..f54b463709e9 100644
--- a/trunk/drivers/video/omap/omapfb_main.c
+++ b/trunk/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]);