From fd668e5fb619552ee86352f1bf03c97698c56b2b Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 13 Dec 2006 00:34:19 -0800
Subject: [PATCH] --- yaml --- r: 44453 b: refs/heads/master c:
 fb0c9295b81f5c7f51058aabfadd13d8e70b48f4 h: refs/heads/master i:   44451:
 bfd47d1bc2d800ac8623cb9609a13d1a7d1e34b7 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/Kconfig     | 2 +-
 trunk/drivers/char/mxser_new.c | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0af33643c9fd..5f5acf615dc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3808ac156f503dd2a00a059d9ff4677ce75244f
+refs/heads/master: fb0c9295b81f5c7f51058aabfadd13d8e70b48f4
diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
index 91133bea8ca0..b1c07ed3cb93 100644
--- a/trunk/drivers/char/Kconfig
+++ b/trunk/drivers/char/Kconfig
@@ -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.
diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c
index efa8076c33e0..cd989dce7c53 100644
--- a/trunk/drivers/char/mxser_new.c
+++ b/trunk/drivers/char/mxser_new.c
@@ -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)