summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-01-30 14:52:16 (GMT)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-02-14 14:55:12 (GMT)
commit1e5635d10d8112e61776b9513491329f7b0859ce (patch)
treedb8d5df9a36b2c86e103da682be9792512dce426 /drivers
parenta50b2eae8b9aed3840d7e045c9417ce5e6c5ce91 (diff)
downloadlinux-1e5635d10d8112e61776b9513491329f7b0859ce.tar.xz
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')
-rw-r--r--drivers/pci/hotplug/s390_pci_hpc.c2
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 dee68e0..8fe2a8a 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 */