From b51110e017d9a3becad4aa994ac6046152ba9a5b Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 18 Oct 2007 03:06:03 -0700 Subject: [PATCH] --- yaml --- r: 71168 b: refs/heads/master c: b8cc55493557f2259ac56ba0ac7f6804804f79a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/mxser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab995151eb38..cc243afe5755 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0678c5b679db7abe8b8d658127e0fed4ceece41c +refs/heads/master: b8cc55493557f2259ac56ba0ac7f6804804f79a5 diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c index a24738e85fb8..661aca0e155d 100644 --- a/trunk/drivers/char/mxser.c +++ b/trunk/drivers/char/mxser.c @@ -383,7 +383,6 @@ static int mxser_init(void); /* static void mxser_poll(unsigned long); */ static int mxser_get_ISA_conf(int, struct mxser_hwconf *); -static int mxser_get_PCI_conf(int, int, int, struct mxser_hwconf *); static void mxser_do_softint(struct work_struct *); static int mxser_open(struct tty_struct *, struct file *); static void mxser_close(struct tty_struct *, struct file *); @@ -422,7 +421,7 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout); static void mxser_startrx(struct tty_struct *tty); static void mxser_stoprx(struct tty_struct *tty); - +#ifdef CONFIG_PCI static int CheckIsMoxaMust(int io) { u8 oldmcr, hwid; @@ -445,6 +444,7 @@ static int CheckIsMoxaMust(int io) } return MOXA_OTHER_UART; } +#endif /* above is modified by Victor Yu. 08-15-2002 */