---

yaml --- r: 217319 b: refs/heads/master c: 41814cf h: refs/heads/master i: 217317: 16bec37 217315: 71e4fe1 217311: f43d919 v: v3
git-mirror · Oct 22, 2010 · 30c67a6 · 30c67a6
1 parent 66fb04c
commit 30c67a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 908482fd833016a365e20c26ea28ceeb00743e64
+refs/heads/master: 41814cfc01b059df33011d929837558c22f3c0e0
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2198,6 +2198,16 @@ static int omapfb_probe(struct platform_device *pdev)
 		goto err0;
 	}
 
+	/* TODO : Replace cpu check with omap_has_vrfb once HAS_FEATURE
+	*	 available for OMAP2 and OMAP3
+	*/
+	if (def_vrfb && !cpu_is_omap24xx() && !cpu_is_omap34xx()) {
+		def_vrfb = 0;
+		dev_warn(&pdev->dev, "VRFB is not supported on this hardware, "
+				"ignoring the module parameter vrfb=y\n");
+	}
+
+
 	mutex_init(&fbdev->mtx);
 
 	fbdev->dev = &pdev->dev;