Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb0c9295 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] mxser_new: fix non-PCI build 



When CONFIG_PCI is not defined (i.e.  PCI bus is disabled), the mxser_new
driver fails to link, since some pci functions are not available.  Fix this
behaviour to be able to compile this driver on machines with no PCI bus
(but with ISA bus support).

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a3808ac1

drivers/char/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ config MOXA_SMARTIO 


config MOXA_SMARTIO_NEW

	tristate "Moxa SmartIO support v. 2.0 (EXPERIMENTAL)"

	depends on SERIAL_NONSTANDARD

	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)

	help

	  Say Y here if you have a Moxa SmartIO multiport serial card and/or

	  want to help develop a new version of this driver.

drivers/char/mxser_new.c

+8 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static struct mxser_mon_ext mon_data_ext; 
static int mxser_set_baud_method[MXSER_PORTS + 1];

static spinlock_t gm_lock;



#ifdef CONFIG_PCI

static int CheckIsMoxaMust(int io)

{

	u8 oldmcr, hwid;
@@ -337,6 +338,7 @@ static int CheckIsMoxaMust(int io) 
	}

	return MOXA_OTHER_UART;

}

#endif



static void process_txrx_fifo(struct mxser_port *info)

{
@@ -2380,9 +2382,11 @@ static void mxser_release_res(struct mxser_board *brd, struct pci_dev *pdev, 
	if (irq)

		free_irq(brd->irq, brd);

	if (pdev != NULL) {	/* PCI */

#ifdef CONFIG_PCI

		pci_release_region(pdev, 2);

		pci_release_region(pdev, 3);

		pci_dev_put(pdev);

#endif

	} else {

		release_region(brd->ports[0].ioaddr, 8 * brd->info->nports);

		release_region(brd->vector, 1);
@@ -2546,6 +2550,7 @@ static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd) 
static int __devinit mxser_probe(struct pci_dev *pdev,

		const struct pci_device_id *ent)

{

#ifdef CONFIG_PCI

	struct mxser_board *brd;

	unsigned int i, j;

	unsigned long ioaddress;
@@ -2644,6 +2649,9 @@ static int __devinit mxser_probe(struct pci_dev *pdev, 
	brd->info = NULL;

err:

	return retval;

#else

	return -ENODEV;

#endif

}



static void __devexit mxser_remove(struct pci_dev *pdev)