diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/uvesafb.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index 1f882ed6ba04..9db3de3a8418 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <video/uvesafb.h> | 23 | #include <video/uvesafb.h> |
24 | #ifdef CONFIG_X86 | 24 | #ifdef CONFIG_X86 |
25 | #include <video/vga.h> | 25 | #include <video/vga.h> |
26 | #include <linux/pci.h> | ||
27 | #endif | 26 | #endif |
28 | #ifdef CONFIG_MTRR | 27 | #ifdef CONFIG_MTRR |
29 | #include <asm/mtrr.h> | 28 | #include <asm/mtrr.h> |
@@ -816,15 +815,8 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info) | |||
816 | par->pmi_setpal = pmi_setpal; | 815 | par->pmi_setpal = pmi_setpal; |
817 | par->ypan = ypan; | 816 | par->ypan = ypan; |
818 | 817 | ||
819 | if (par->pmi_setpal || par->ypan) { | 818 | if (par->pmi_setpal || par->ypan) |
820 | if (pcibios_enabled) { | 819 | uvesafb_vbe_getpmi(task, par); |
821 | uvesafb_vbe_getpmi(task, par); | ||
822 | } else { | ||
823 | par->pmi_setpal = par->ypan = 0; | ||
824 | printk(KERN_WARNING "uvesafb: PCI BIOS area is NX." | ||
825 | "Can't use protected mode interface\n"); | ||
826 | } | ||
827 | } | ||
828 | #else | 820 | #else |
829 | /* The protected mode interface is not available on non-x86. */ | 821 | /* The protected mode interface is not available on non-x86. */ |
830 | par->pmi_setpal = par->ypan = 0; | 822 | par->pmi_setpal = par->ypan = 0; |