Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 287aa1d2a13c..81c8bd5eca8e 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -882,10 +882,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);
@@ -908,6 +919,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);
 }