2 files changed, 1 insertions, 7 deletions

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index f34838839b08..29437eabe095 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/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index e25cf31faab2..fa60add0ff63 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -18,7 +18,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/dmi.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
@@ -376,7 +375,6 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
                              size_t cnt, loff_t *ppos)
 {
         char usercmd[64];
-        const char *pdev_name;
         int ret;
         bool delay = false, can_switch;
         bool just_mux = false;
@@ -468,7 +466,6 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
                 goto out;
 
         if (can_switch) {
-                pdev_name = pci_name(client->pdev);
                 ret = vga_switchto_stage1(client);
                 if (ret)
                         printk(KERN_ERR "vga_switcheroo: switching failed stage 1 %d\n", ret);
@@ -540,7 +537,6 @@ fail:
 int vga_switcheroo_process_delayed_switch(void)
 {
         struct vga_switcheroo_client *client;
-        const char *pdev_name;
         int ret;
         int err = -EINVAL;
 
@@ -555,7 +551,6 @@ int vga_switcheroo_process_delayed_switch(void)
         if (!client || !check_can_switch())
                 goto err;
 
-        pdev_name = pci_name(client->pdev);
         ret = vga_switchto_stage2(client);
         if (ret)
                 printk(KERN_ERR "vga_switcheroo: delayed switching failed stage 2 %d\n", ret);
@@ -567,4 +562,3 @@ err:
         return err;
 }
 EXPORT_SYMBOL(vga_switcheroo_process_delayed_switch);
-