diff options
| -rw-r--r-- | drivers/isdn/hisax/bkm_a8.c | 8 | ||||
| -rw-r--r-- | drivers/isdn/hisax/telespci.c | 8 | ||||
| -rw-r--r-- | drivers/isdn/hisax/w6692.c | 7 |
3 files changed, 3 insertions, 20 deletions
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c index 6339bb443f62..99ef3b43fcd7 100644 --- a/drivers/isdn/hisax/bkm_a8.c +++ b/drivers/isdn/hisax/bkm_a8.c | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include "bkm_ax.h" | 21 | #include "bkm_ax.h" |
| 22 | 22 | ||
| 23 | #ifdef CONFIG_PCI | ||
| 24 | |||
| 25 | #define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */ | 23 | #define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */ |
| 26 | 24 | ||
| 27 | extern const char *CardType[]; | 25 | extern const char *CardType[]; |
| @@ -279,12 +277,9 @@ static u_char pci_bus __devinitdata = 0; | |||
| 279 | static u_char pci_device_fn __devinitdata = 0; | 277 | static u_char pci_device_fn __devinitdata = 0; |
| 280 | static u_char pci_irq __devinitdata = 0; | 278 | static u_char pci_irq __devinitdata = 0; |
| 281 | 279 | ||
| 282 | #endif /* CONFIG_PCI */ | ||
| 283 | |||
| 284 | int __devinit | 280 | int __devinit |
| 285 | setup_sct_quadro(struct IsdnCard *card) | 281 | setup_sct_quadro(struct IsdnCard *card) |
| 286 | { | 282 | { |
| 287 | #ifdef CONFIG_PCI | ||
| 288 | struct IsdnCardState *cs = card->cs; | 283 | struct IsdnCardState *cs = card->cs; |
| 289 | char tmp[64]; | 284 | char tmp[64]; |
| 290 | u_int found = 0; | 285 | u_int found = 0; |
| @@ -442,7 +437,4 @@ setup_sct_quadro(struct IsdnCard *card) | |||
| 442 | sct_quadro_subtypes[cs->subtyp], | 437 | sct_quadro_subtypes[cs->subtyp], |
| 443 | readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID)); | 438 | readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID)); |
| 444 | return (1); | 439 | return (1); |
| 445 | #else | ||
| 446 | printk(KERN_ERR "HiSax: bkm_a8 only supported on PCI Systems\n"); | ||
| 447 | #endif /* CONFIG_PCI */ | ||
| 448 | } | 440 | } |
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index d09f6d033f15..4393003ae162 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c | |||
| @@ -295,11 +295,12 @@ setup_telespci(struct IsdnCard *card) | |||
| 295 | #ifdef __BIG_ENDIAN | 295 | #ifdef __BIG_ENDIAN |
| 296 | #error "not running on big endian machines now" | 296 | #error "not running on big endian machines now" |
| 297 | #endif | 297 | #endif |
| 298 | |||
| 298 | strcpy(tmp, telespci_revision); | 299 | strcpy(tmp, telespci_revision); |
| 299 | printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp)); | 300 | printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp)); |
| 300 | if (cs->typ != ISDN_CTYPE_TELESPCI) | 301 | if (cs->typ != ISDN_CTYPE_TELESPCI) |
| 301 | return (0); | 302 | return (0); |
| 302 | #ifdef CONFIG_PCI | 303 | |
| 303 | if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { | 304 | if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { |
| 304 | if (pci_enable_device(dev_tel)) | 305 | if (pci_enable_device(dev_tel)) |
| 305 | return(0); | 306 | return(0); |
| @@ -317,11 +318,6 @@ setup_telespci(struct IsdnCard *card) | |||
| 317 | printk(KERN_WARNING "TelesPCI: No PCI card found\n"); | 318 | printk(KERN_WARNING "TelesPCI: No PCI card found\n"); |
| 318 | return(0); | 319 | return(0); |
| 319 | } | 320 | } |
| 320 | #else | ||
| 321 | printk(KERN_WARNING "HiSax: Teles/PCI and NO_PCI_BIOS\n"); | ||
| 322 | printk(KERN_WARNING "HiSax: Teles/PCI unable to config\n"); | ||
| 323 | return (0); | ||
| 324 | #endif /* CONFIG_PCI */ | ||
| 325 | 321 | ||
| 326 | /* Initialize Zoran PCI controller */ | 322 | /* Initialize Zoran PCI controller */ |
| 327 | writel(0x00000000, cs->hw.teles0.membase + 0x28); | 323 | writel(0x00000000, cs->hw.teles0.membase + 0x28); |
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index 3aeceaf9769e..39129b94f8be 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c | |||
| @@ -1009,7 +1009,7 @@ setup_w6692(struct IsdnCard *card) | |||
| 1009 | printk(KERN_INFO "HiSax: W6692 driver Rev. %s\n", HiSax_getrev(tmp)); | 1009 | printk(KERN_INFO "HiSax: W6692 driver Rev. %s\n", HiSax_getrev(tmp)); |
| 1010 | if (cs->typ != ISDN_CTYPE_W6692) | 1010 | if (cs->typ != ISDN_CTYPE_W6692) |
| 1011 | return (0); | 1011 | return (0); |
| 1012 | #ifdef CONFIG_PCI | 1012 | |
| 1013 | while (id_list[id_idx].vendor_id) { | 1013 | while (id_list[id_idx].vendor_id) { |
| 1014 | dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, | 1014 | dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, |
| 1015 | id_list[id_idx].device_id, | 1015 | id_list[id_idx].device_id, |
| @@ -1061,11 +1061,6 @@ setup_w6692(struct IsdnCard *card) | |||
| 1061 | cs->hw.w6692.iobase + 255); | 1061 | cs->hw.w6692.iobase + 255); |
| 1062 | return (0); | 1062 | return (0); |
| 1063 | } | 1063 | } |
| 1064 | #else | ||
| 1065 | printk(KERN_WARNING "HiSax: W6692 and NO_PCI_BIOS\n"); | ||
| 1066 | printk(KERN_WARNING "HiSax: W6692 unable to config\n"); | ||
| 1067 | return (0); | ||
| 1068 | #endif /* CONFIG_PCI */ | ||
| 1069 | 1064 | ||
| 1070 | printk(KERN_INFO | 1065 | printk(KERN_INFO |
| 1071 | "HiSax: %s config irq:%d I/O:%x\n", | 1066 | "HiSax: %s config irq:%d I/O:%x\n", |
