From 8d6d4df3c31cb811ddd447c9d344be7458bb6328 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 17 Oct 2012 12:16:50 +0300
Subject: [PATCH] --- yaml --- r: 339639 b: refs/heads/master c:
 a89d1a87ad80277939c7fcfb8484f0b110d264ef h: refs/heads/master i:   339637:
 af84250ad1ded2e9200df5bc514d5025a433a228   339635:
 62115260c168a23a011cb22472020b9d45fe609a   339631:
 c0f6d2f0b3474f8d3ee2f8ece6d9dcd4d3fd9245 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d70d016b072a..e44c0550df05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa1e49a3752f09b3d2ab706f6d48916a04acf557
+refs/heads/master: a89d1a87ad80277939c7fcfb8484f0b110d264ef
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index 5943b3a5d55a..bc225e46fdd2 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -31,7 +31,6 @@
 #include <linux/omapfb.h>
 
 #include <video/omapdss.h>
-#include <plat/cpu.h>
 #include <plat/vram.h>
 #include <video/omapvrfb.h>
 
@@ -2396,10 +2395,7 @@ static int __init 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()) {
+	if (def_vrfb && !omap_vrfb_supported()) {
 		def_vrfb = 0;
 		dev_warn(&pdev->dev, "VRFB is not supported on this hardware, "
 				"ignoring the module parameter vrfb=y\n");