Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137399
b: refs/heads/master
c: 782385a
h: refs/heads/master
i:
  137397: 014340b
  137395: 94dd515
  137391: f9f82b4
v: v3
  • Loading branch information
Eric Miao committed Mar 19, 2009
1 parent 9fd8a4e commit 48f07bb
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c68ffddabcaaa64c6ea681d2944cbda50a8654ea
refs/heads/master: 782385ae176b304c7105051e1b06c68bc0b4a2ba
14 changes: 14 additions & 0 deletions trunk/drivers/video/pxafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down

0 comments on commit 48f07bb

Please sign in to comment.