diff options
Diffstat (limited to 'drivers/video/pxafb.c')
-rw-r--r-- | drivers/video/pxafb.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 2552b9f325ee..84f63205c46d 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <asm/io.h> | 59 | #include <asm/io.h> |
60 | #include <asm/irq.h> | 60 | #include <asm/irq.h> |
61 | #include <asm/div64.h> | 61 | #include <asm/div64.h> |
62 | #include <mach/pxa-regs.h> | ||
63 | #include <mach/bitfield.h> | 62 | #include <mach/bitfield.h> |
64 | #include <mach/pxafb.h> | 63 | #include <mach/pxafb.h> |
65 | 64 | ||
@@ -883,10 +882,21 @@ static void __devinit init_pxafb_overlay(struct pxafb_info *fbi, | |||
883 | init_completion(&ofb->branch_done); | 882 | init_completion(&ofb->branch_done); |
884 | } | 883 | } |
885 | 884 | ||
885 | static inline int pxafb_overlay_supported(void) | ||
886 | { | ||
887 | if (cpu_is_pxa27x() || cpu_is_pxa3xx()) | ||
888 | return 1; | ||
889 | |||
890 | return 0; | ||
891 | } | ||
892 | |||
886 | static int __devinit pxafb_overlay_init(struct pxafb_info *fbi) | 893 | static int __devinit pxafb_overlay_init(struct pxafb_info *fbi) |
887 | { | 894 | { |
888 | int i, ret; | 895 | int i, ret; |
889 | 896 | ||
897 | if (!pxafb_overlay_supported()) | ||
898 | return 0; | ||
899 | |||
890 | for (i = 0; i < 2; i++) { | 900 | for (i = 0; i < 2; i++) { |
891 | init_pxafb_overlay(fbi, &fbi->overlay[i], i); | 901 | init_pxafb_overlay(fbi, &fbi->overlay[i], i); |
892 | ret = register_framebuffer(&fbi->overlay[i].fb); | 902 | ret = register_framebuffer(&fbi->overlay[i].fb); |
@@ -909,6 +919,9 @@ static void __devexit pxafb_overlay_exit(struct pxafb_info *fbi) | |||
909 | { | 919 | { |
910 | int i; | 920 | int i; |
911 | 921 | ||
922 | if (!pxafb_overlay_supported()) | ||
923 | return; | ||
924 | |||
912 | for (i = 0; i < 2; i++) | 925 | for (i = 0; i < 2; i++) |
913 | unregister_framebuffer(&fbi->overlay[i].fb); | 926 | unregister_framebuffer(&fbi->overlay[i].fb); |
914 | } | 927 | } |