diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-10-18 06:06:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:24 -0400 |
commit | b8cc55493557f2259ac56ba0ac7f6804804f79a5 (patch) | |
tree | 84cacd86f0307e2292e9e632e4056ef178a5f304 | |
parent | 0678c5b679db7abe8b8d658127e0fed4ceece41c (diff) |
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>
-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); | |||
383 | 383 | ||
384 | /* static void mxser_poll(unsigned long); */ | 384 | /* static void mxser_poll(unsigned long); */ |
385 | static int mxser_get_ISA_conf(int, struct mxser_hwconf *); | 385 | static int mxser_get_ISA_conf(int, struct mxser_hwconf *); |
386 | static int mxser_get_PCI_conf(int, int, int, struct mxser_hwconf *); | ||
387 | static void mxser_do_softint(struct work_struct *); | 386 | static void mxser_do_softint(struct work_struct *); |
388 | static int mxser_open(struct tty_struct *, struct file *); | 387 | static int mxser_open(struct tty_struct *, struct file *); |
389 | static void mxser_close(struct tty_struct *, struct file *); | 388 | 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); | |||
422 | static void mxser_startrx(struct tty_struct *tty); | 421 | static void mxser_startrx(struct tty_struct *tty); |
423 | static void mxser_stoprx(struct tty_struct *tty); | 422 | static void mxser_stoprx(struct tty_struct *tty); |
424 | 423 | ||
425 | 424 | #ifdef CONFIG_PCI | |
426 | static int CheckIsMoxaMust(int io) | 425 | static int CheckIsMoxaMust(int io) |
427 | { | 426 | { |
428 | u8 oldmcr, hwid; | 427 | u8 oldmcr, hwid; |
@@ -445,6 +444,7 @@ static int CheckIsMoxaMust(int io) | |||
445 | } | 444 | } |
446 | return MOXA_OTHER_UART; | 445 | return MOXA_OTHER_UART; |
447 | } | 446 | } |
447 | #endif | ||
448 | 448 | ||
449 | /* above is modified by Victor Yu. 08-15-2002 */ | 449 | /* above is modified by Victor Yu. 08-15-2002 */ |
450 | 450 | ||