diff options
| author |   Jesper Juhl <jesper.juhl@gmail.com> | 2007-10-18 03:06:03 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:24 -0700 |
| commit | b8cc55493557f2259ac56ba0ac7f6804804f79a5 (patch) | |
| tree | 84cacd86f0307e2292e9e632e4056ef178a5f304 /drivers | |
| parent | mxser: remove commented crap (diff) | |
| download | linux-dev-b8cc55493557f2259ac56ba0ac7f6804804f79a5.tar.xz linux-dev-b8cc55493557f2259ac56ba0ac7f6804804f79a5.zip | |
mxser: fix compiler warning when building without CONFIG_PCI
drivers/char/mxser.c:386: warning: 'mxser_get_PCI_conf' declared 'static' but never defined
when building without CONFIG_PCI.
[jesper.juhl@gmail.com: Fix warning: 'CheckIsMoxaMust' defined but not used]
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/mxser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index a24738e85fb8..661aca0e155d 100644 --- a/drivers/char/mxser.c +++ b/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 */ |