s390/pci: disable per default

Disable pci on s390. Enable with pci=on.

Suggested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 6a054bf83eb0d75cc065416aaacedfa8bec91451..dd8e13ef506c49d4e27cb8a2d1c1be0f988c292c 100644 (file)
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -1106,13 +1106,13 @@ void zpci_deregister_hp_ops(void)
 }
 EXPORT_SYMBOL_GPL(zpci_deregister_hp_ops);
 
-unsigned int s390_pci_probe = 1;
+unsigned int s390_pci_probe;
 EXPORT_SYMBOL_GPL(s390_pci_probe);
 
 char * __init pcibios_setup(char *str)
 {
-       if (!strcmp(str, "off")) {
-               s390_pci_probe = 0;
+       if (!strcmp(str, "on")) {
+               s390_pci_probe = 1;
                return NULL;
        }
        return str;