From: Todd Poynor <tpoynor@mvista.com>
Date: Tue, 3 Jan 2006 17:12:29 +0000 (-0800)
Subject: [PATCH] ARM: OMAP: Fix fb driver miscompile
X-Git-Tag: v2.6.15-omap2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2a6e47add519246bf48b82acf68ee49705d6cd37;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: Fix fb driver miscompile

Fix fb driver miscompile
---

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 0eefec5bec3..ed5aa4cb206 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -1250,7 +1250,9 @@ static int omapfb_probe(struct platform_device *pdev)
 	init_MUTEX(&fbdev->rqueue_sema);
 
 #ifdef CONFIG_ARCH_OMAP1
+#ifdef CONFIG_FB_OMAP_LCDC_INTERNAL
 	fbdev->int_ctrl = &omap1_int_ctrl;
+#endif
 #ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
 	fbdev->ext_if = &sossi_extif;
 #endif