diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-01-30 14:52:16 (GMT) |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-14 14:55:12 (GMT) |
commit | 1e5635d10d8112e61776b9513491329f7b0859ce (patch) | |
tree | db8d5df9a36b2c86e103da682be9792512dce426 /arch/s390/include/asm/pci.h | |
parent | a50b2eae8b9aed3840d7e045c9417ce5e6c5ce91 (diff) | |
download | linux-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 'arch/s390/include/asm/pci.h')
-rw-r--r-- | arch/s390/include/asm/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 23d6a24..6383c44 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -186,7 +186,7 @@ void zpci_dma_exit(void); extern struct mutex zpci_list_lock; extern struct list_head zpci_list; extern struct pci_hp_callback_ops hotplug_ops; -extern unsigned int pci_probe; +extern unsigned int s390_pci_probe; /* FMB */ int zpci_fmb_enable_device(struct zpci_dev *); |