---

yaml --- r: 362804 b: refs/heads/master c: 89b0dc9 h: refs/heads/master v: v3
git-mirror · Apr 17, 2013 · a651132 · a651132
1 parent 77674cc
commit a651132
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c3700bbb2c9c9c1d10f930d400f573d55f8e750
+refs/heads/master: 89b0dc958b7ac08ecf23ca25df98f7effe897ed9
diff --git a/trunk/arch/s390/pci/pci.c b/trunk/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;