From 48f07bbea47bcb91f007e088f3145ac5db75b45c Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Thu, 19 Mar 2009 15:24:30 +0800
Subject: [PATCH] --- yaml --- r: 137399 b: refs/heads/master c:
 782385ae176b304c7105051e1b06c68bc0b4a2ba h: refs/heads/master i:   137397:
 014340b31457a18d271d6453e1fdf87d851fc734   137395:
 94dd5155211f09aca36360d511dca1364af532d7   137391:
 f9f82b48a5bbb7ab89213833fe4ad224909d8455 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/pxafb.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bc9fa03a454c..d800bf1be224 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c68ffddabcaaa64c6ea681d2944cbda50a8654ea
+refs/heads/master: 782385ae176b304c7105051e1b06c68bc0b4a2ba
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 48ff701d3a72..40a5d9d66755 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -883,10 +883,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi,
 	init_completion(&ofb->branch_done);
 }
 
+static inline int pxafb_overlay_supported(void)
+{
+	if (cpu_is_pxa27x() || cpu_is_pxa3xx())
+		return 1;
+
+	return 0;
+}
+
 static int __devinit pxafb_overlay_init(struct pxafb_info *fbi)
 {
 	int i, ret;
 
+	if (!pxafb_overlay_supported())
+		return 0;
+
 	for (i = 0; i < 2; i++) {
 		init_pxafb_overlay(fbi, &fbi->overlay[i], i);
 		ret = register_framebuffer(&fbi->overlay[i].fb);
@@ -909,6 +920,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi)
 {
 	int i;
 
+	if (!pxafb_overlay_supported())
+		return;
+
 	for (i = 0; i < 2; i++)
 		unregister_framebuffer(&fbi->overlay[i].fb);
 }