diff options
Diffstat (limited to 'drivers/isdn/hisax/niccy.c')
| -rw-r--r-- | drivers/isdn/hisax/niccy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index ef00633e1d2a..ccaa6e13310f 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c | |||
| @@ -297,12 +297,12 @@ int __devinit setup_niccy(struct IsdnCard *card) | |||
| 297 | return 0; | 297 | return 0; |
| 298 | } | 298 | } |
| 299 | } else { | 299 | } else { |
| 300 | #ifdef CONFIG_PCI_LEGACY | 300 | #ifdef CONFIG_PCI |
| 301 | static struct pci_dev *niccy_dev __devinitdata; | 301 | static struct pci_dev *niccy_dev __devinitdata; |
| 302 | 302 | ||
| 303 | u_int pci_ioaddr; | 303 | u_int pci_ioaddr; |
| 304 | cs->subtyp = 0; | 304 | cs->subtyp = 0; |
| 305 | if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM, | 305 | if ((niccy_dev = hisax_find_pci_device(PCI_VENDOR_ID_SATSAGEM, |
| 306 | PCI_DEVICE_ID_SATSAGEM_NICCY, | 306 | PCI_DEVICE_ID_SATSAGEM_NICCY, |
| 307 | niccy_dev))) { | 307 | niccy_dev))) { |
| 308 | if (pci_enable_device(niccy_dev)) | 308 | if (pci_enable_device(niccy_dev)) |
| @@ -354,7 +354,7 @@ int __devinit setup_niccy(struct IsdnCard *card) | |||
| 354 | printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); | 354 | printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); |
| 355 | printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); | 355 | printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); |
| 356 | return 0; | 356 | return 0; |
| 357 | #endif /* CONFIG_PCI_LEGACY */ | 357 | #endif /* CONFIG_PCI */ |
| 358 | } | 358 | } |
| 359 | printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n", | 359 | printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n", |
| 360 | (cs->subtyp == 1) ? "PnP" : "PCI", | 360 | (cs->subtyp == 1) ? "PnP" : "PCI", |
