diff options
| author | Jeff Garzik | 2007-10-29 14:48:09 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2007-11-05 22:35:17 +0100 |
| commit | bd3989e006ed1c88d47c3308746ae0330fc1bcf4 (patch) | |
| tree | e2e5bb10e57e901519f998f9ac703d3bc8bb9c1e /drivers/isdn/hisax/diva.c | |
| parent | PCI: pciserial_resume_one ignored return value of pci_enable_device (diff) | |
| download | kernel-qcow2-linux-bd3989e006ed1c88d47c3308746ae0330fc1bcf4.tar.gz kernel-qcow2-linux-bd3989e006ed1c88d47c3308746ae0330fc1bcf4.tar.xz kernel-qcow2-linux-bd3989e006ed1c88d47c3308746ae0330fc1bcf4.zip | |
PCI: Add Kconfig option to disable deprecated pci_find_* API
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/isdn/hisax/diva.c')
| -rw-r--r-- | drivers/isdn/hisax/diva.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 826745078746..2d670856d141 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c @@ -1148,7 +1148,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) #endif /* ISAPNP */ -#ifdef CONFIG_PCI +#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_diva __devinitdata = NULL; static struct pci_dev *dev_diva_u __devinitdata = NULL; static struct pci_dev *dev_diva201 __devinitdata = NULL; @@ -1229,14 +1229,14 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) return (1); /* card found */ } -#else /* if !CONFIG_PCI */ +#else /* if !CONFIG_PCI_LEGACY */ static int __devinit setup_diva_pci(struct IsdnCard *card) { return (-1); /* card not found; continue search */ } -#endif /* CONFIG_PCI */ +#endif /* CONFIG_PCI_LEGACY */ int __devinit setup_diva(struct IsdnCard *card) |