diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/char/moxa.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/char/moxa.c')
| -rw-r--r-- | drivers/char/moxa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index ca260fede..b2d959f36 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -482,13 +482,15 @@ int moxa_init(void) #endif /* Find PCI boards here */ #ifdef CONFIG_PCI - if (pci_present()) { + { struct pci_dev *p = NULL; n = sizeof(moxa_pcibrds) / sizeof(moxa_pciinfo); i = 0; while (i < n) { while((p = pci_find_device(moxa_pcibrds[i].vendor_id, moxa_pcibrds[i].device_id, p))!=NULL) { + if (pci_enable_device(p)) + continue; if (numBoards >= MAX_BOARDS) { if (verbose) printk("More than %d MOXA Intellio family boards found. Board is ignored.", MAX_BOARDS); @@ -511,9 +513,7 @@ int moxa_init(void) static int moxa_get_PCI_conf(struct pci_dev *p, int board_type, moxa_board_conf * board) { - unsigned int val; - - board->baseAddr = p->resource[2].start; + board->baseAddr = pci_resource_start (p, 2); board->boardType = board_type; switch (board_type) { case MOXA_BOARD_C218_ISA: |