summaryrefslogtreecommitdiffstats
path: root/drivers/video/pxafb.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-03-23 09:55:09 +0800
committerEric Miao <eric.miao@marvell.com>2009-03-23 09:55:14 +0800
commitfa12868e59f5f49bc42b8befd94c531bb07ec120 (patch)
tree25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3 /drivers/video/pxafb.c
parentcefdb2a4436ec83b4c8b349aa30f976d30c22e25 (diff)
parent1efb71809fd47bc19b3ce05080e1d5085a8dfab1 (diff)
downloadop-kernel-dev-fa12868e59f5f49bc42b8befd94c531bb07ec120.zip
op-kernel-dev-fa12868e59f5f49bc42b8befd94c531bb07ec120.tar.gz
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel
Diffstat (limited to 'drivers/video/pxafb.c')
-rw-r--r--drivers/video/pxafb.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 287aa1d..81c8bd5 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);
}
OpenPOWER on IntegriCloud