diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250.c | 2 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm.h | 1 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 2 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 218b69372c0b..0d9358608fdf 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -51,7 +51,7 @@ | |||
51 | * share_irqs - whether we pass SA_SHIRQ to request_irq(). This option | 51 | * share_irqs - whether we pass SA_SHIRQ to request_irq(). This option |
52 | * is unsafe when used on edge-triggered interrupts. | 52 | * is unsafe when used on edge-triggered interrupts. |
53 | */ | 53 | */ |
54 | unsigned int share_irqs = SERIAL8250_SHARE_IRQS; | 54 | static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; |
55 | 55 | ||
56 | /* | 56 | /* |
57 | * Debugging. | 57 | * Debugging. |
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index e0717611c940..777829fa3300 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h | |||
@@ -393,7 +393,6 @@ int jsm_tty_init(struct jsm_board *); | |||
393 | int jsm_uart_port_init(struct jsm_board *); | 393 | int jsm_uart_port_init(struct jsm_board *); |
394 | int jsm_remove_uart_port(struct jsm_board *); | 394 | int jsm_remove_uart_port(struct jsm_board *); |
395 | void jsm_input(struct jsm_channel *ch); | 395 | void jsm_input(struct jsm_channel *ch); |
396 | void jsm_carrier(struct jsm_channel *ch); | ||
397 | void jsm_check_queue_flow_control(struct jsm_channel *ch); | 396 | void jsm_check_queue_flow_control(struct jsm_channel *ch); |
398 | 397 | ||
399 | #endif | 398 | #endif |
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index 9b79c1ff6c72..3a11a69feb44 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c | |||
@@ -688,7 +688,7 @@ static void neo_flush_uart_read(struct jsm_channel *ch) | |||
688 | /* | 688 | /* |
689 | * No locks are assumed to be held when calling this function. | 689 | * No locks are assumed to be held when calling this function. |
690 | */ | 690 | */ |
691 | void neo_clear_break(struct jsm_channel *ch, int force) | 691 | static void neo_clear_break(struct jsm_channel *ch, int force) |
692 | { | 692 | { |
693 | unsigned long lock_flags; | 693 | unsigned long lock_flags; |
694 | 694 | ||
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 24fe76c28833..98de2258fd06 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
@@ -31,6 +31,8 @@ | |||
31 | 31 | ||
32 | #include "jsm.h" | 32 | #include "jsm.h" |
33 | 33 | ||
34 | static void jsm_carrier(struct jsm_channel *ch); | ||
35 | |||
34 | static inline int jsm_get_mstat(struct jsm_channel *ch) | 36 | static inline int jsm_get_mstat(struct jsm_channel *ch) |
35 | { | 37 | { |
36 | unsigned char mstat; | 38 | unsigned char mstat; |
@@ -755,7 +757,7 @@ void jsm_input(struct jsm_channel *ch) | |||
755 | jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n"); | 757 | jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n"); |
756 | } | 758 | } |
757 | 759 | ||
758 | void jsm_carrier(struct jsm_channel *ch) | 760 | static void jsm_carrier(struct jsm_channel *ch) |
759 | { | 761 | { |
760 | struct jsm_board *bd; | 762 | struct jsm_board *bd; |
761 | 763 | ||