diff options
| author |   Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-12-12 17:55:22 +0100 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-12-16 14:37:56 +0100 |
| commit | 257608fb4112b4cabefd9e33a4fc2df6b64dca6a (patch) | |
| tree | 0d11b1b5db5fcd6d77c09baed6168f24d2f19b3f /arch/s390 | |
| parent | s390/pci/dma: fix accounting of allocated_pages (diff) | |
| download | linux-dev-257608fb4112b4cabefd9e33a4fc2df6b64dca6a.tar.xz linux-dev-257608fb4112b4cabefd9e33a4fc2df6b64dca6a.zip | |
s390/pci: reenable per default
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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/pci/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index e3265b50f3ae..0820362c7b0f 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -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; |