diff options
author | 2013-01-30 15:52:16 +0100 | |
---|---|---|
committer | 2013-02-14 15:55:12 +0100 | |
commit | 1e5635d10d8112e61776b9513491329f7b0859ce (patch) | |
tree | db8d5df9a36b2c86e103da682be9792512dce426 /drivers/pci | |
parent | s390/dma: remove dma_is_consistent() declaration (diff) | |
download | linux-1e5635d10d8112e61776b9513491329f7b0859ce.tar.gz linux-1e5635d10d8112e61776b9513491329f7b0859ce.tar.bz2 linux-1e5635d10d8112e61776b9513491329f7b0859ce.zip |
s390/pci: rename pci_probe to s390_pci_probe
pci_probe is too generic and has a name clash with other common code parts.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/s390_pci_hpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c index dee68e0698e1..8fe2a8aa89a1 100644 --- a/drivers/pci/hotplug/s390_pci_hpc.c +++ b/drivers/pci/hotplug/s390_pci_hpc.c @@ -231,7 +231,7 @@ static int __init pci_hotplug_s390_init(void) * right now. */ - if (!pci_probe) + if (!s390_pci_probe) return -EOPNOTSUPP; /* register callbacks for slot handling from arch code */ |