summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-04-16 14:19:22 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-04-17 14:07:39 +0200
commit89b0dc958b7ac08ecf23ca25df98f7effe897ed9 (patch)
tree3825066a5f56a945af4da18059fb4cf96c8f029d /arch/s390
parent2c3700bbb2c9c9c1d10f930d400f573d55f8e750 (diff)
downloadlinux-89b0dc958b7ac08ecf23ca25df98f7effe897ed9.tar.bz2
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>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/pci/pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 6a054bf83eb0..dd8e13ef506c 100644
--- 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;