diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-23 16:42:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-23 16:42:30 +0000 |
| commit | dc85ce155b7cad4c39c1fc95b4f6281920cef3c8 (patch) | |
| tree | 5b7b353f9dbd6590493eb33f405e4ac8524b90e0 /drivers | |
| parent | 4731f8b66dd34ebf0e67ca6ba9162b0e509bec06 (diff) | |
| parent | 1efb71809fd47bc19b3ce05080e1d5085a8dfab1 (diff) | |
| download | blackbird-op-linux-dc85ce155b7cad4c39c1fc95b4f6281920cef3c8.tar.gz blackbird-op-linux-dc85ce155b7cad4c39c1fc95b4f6281920cef3c8.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/pxafb.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 2552b9f325ee..642c1d47178f 100644 --- a/drivers/video/pxafb.c +++ b/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); } |
