Patchwork [RFC,10/10] vga: compile fix, disable vga for s390

login
register
mail settings
Submitter Jan Glauber
Date Nov. 14, 2012, 9:41 a.m.
Message ID <65c7c355e98193fbf866edc3edfe429d5f59047e.1352719878.git.jang@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/198849/
State Not Applicable
Headers show

Comments

Jan Glauber - Nov. 14, 2012, 9:41 a.m.
Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
---
 drivers/gpu/vga/Kconfig | 2 +-
 include/video/vga.h     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index f348388..29437ea 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -1,7 +1,7 @@ 
 config VGA_ARB
 	bool "VGA Arbitration" if EXPERT
 	default y
-	depends on PCI
+	depends on (PCI && !S390)
 	help
 	  Some "legacy" VGA devices implemented on PCI typically have the same
 	  hard-decoded addresses as they did on ISA. When multiple PCI devices
diff --git a/include/video/vga.h b/include/video/vga.h
index cac567f..7978d31 100644
--- a/include/video/vga.h
+++ b/include/video/vga.h
@@ -19,7 +19,9 @@ 
 
 #include <linux/types.h>
 #include <asm/io.h>
+#ifndef __s390x__
 #include <asm/vga.h>
+#endif
 #include <asm/byteorder.h>