s390/pci: reenable per default
authorSebastian Ott <sebott@linux.vnet.ibm.com>
Thu, 12 Dec 2013 16:55:22 +0000 (17:55 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 16 Dec 2013 13:37:56 +0000 (14:37 +0100)
HW, FW and Linux support is in a better shape now - let's reenable
pci bus probing per default.

Acked-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/pci/pci.c

index e3265b50f3ae8c7744518095b8057b3aa16f4441..0820362c7b0f190ec66029597dee6d006d9487c0 100644 (file)
@@ -919,13 +919,13 @@ static void zpci_mem_exit(void)
        kmem_cache_destroy(zdev_fmb_cache);
 }
 
-static unsigned int s390_pci_probe;
+static unsigned int s390_pci_probe = 1;
 static unsigned int s390_pci_initialized;
 
 char * __init pcibios_setup(char *str)
 {
-       if (!strcmp(str, "on")) {
-               s390_pci_probe = 1;
+       if (!strcmp(str, "off")) {
+               s390_pci_probe = 0;
                return NULL;
        }
        return str;