From e70c1d2f33d1f90943806fc8f4cfe871af9591f0 Mon Sep 17 00:00:00 2001
From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Wed, 21 Mar 2012 13:22:01 +0000
Subject: [PATCH] --- yaml --- r: 294354 b: refs/heads/master c:
 6bff98b455cf3e666fd0e3d0d908eba874de0eee h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/video/uvesafb.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 6b98b34c8bde..d7aaf34c670a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc7e57fa80ec5231e33ee2f51f6211c9fb84b9e3
+refs/heads/master: 6bff98b455cf3e666fd0e3d0d908eba874de0eee
diff --git a/trunk/drivers/video/uvesafb.c b/trunk/drivers/video/uvesafb.c
index 1f882ed6ba04..9db3de3a8418 100644
--- a/trunk/drivers/video/uvesafb.c
+++ b/trunk/drivers/video/uvesafb.c
@@ -23,7 +23,6 @@
 #include <video/uvesafb.h>
 #ifdef CONFIG_X86
 #include <video/vga.h>
-#include <linux/pci.h>
 #endif
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
@@ -816,15 +815,8 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
 	par->pmi_setpal = pmi_setpal;
 	par->ypan = ypan;
 
-	if (par->pmi_setpal || par->ypan) {
-		if (pcibios_enabled) {
-			uvesafb_vbe_getpmi(task, par);
-		} else {
-			par->pmi_setpal = par->ypan = 0;
-			printk(KERN_WARNING "uvesafb: PCI BIOS area is NX."
-				"Can't use protected mode interface\n");
-		}
-	}
+	if (par->pmi_setpal || par->ypan)
+		uvesafb_vbe_getpmi(task, par);
 #else
 	/* The protected mode interface is not available on non-x86. */
 	par->pmi_setpal = par->ypan = 0;