aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/8250.c2
-rw-r--r--drivers/serial/crisv10.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index daa00567bc44..1889a63ebc22 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -3123,7 +3123,7 @@ static int __init serial8250_init(void)
3123 if (nr_uarts > UART_NR) 3123 if (nr_uarts > UART_NR)
3124 nr_uarts = UART_NR; 3124 nr_uarts = UART_NR;
3125 3125
3126 printk(KERN_INFO "Serial: 8250/16550 driver" 3126 printk(KERN_INFO "Serial: 8250/16550 driver, "
3127 "%d ports, IRQ sharing %sabled\n", nr_uarts, 3127 "%d ports, IRQ sharing %sabled\n", nr_uarts,
3128 share_irqs ? "en" : "dis"); 3128 share_irqs ? "en" : "dis");
3129 3129
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 8b2c619a09f2..e642c22c80e2 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -1203,7 +1203,7 @@ static void e100_disable_txdma_channel(struct e100_serial *info)
1203 unsigned long flags; 1203 unsigned long flags;
1204 1204
1205 /* Disable output DMA channel for the serial port in question 1205 /* Disable output DMA channel for the serial port in question
1206 * ( set to something other then serialX) 1206 * ( set to something other than serialX)
1207 */ 1207 */
1208 local_irq_save(flags); 1208 local_irq_save(flags);
1209 DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line)); 1209 DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line));
@@ -1266,7 +1266,7 @@ static void e100_disable_rxdma_channel(struct e100_serial *info)
1266 unsigned long flags; 1266 unsigned long flags;
1267 1267
1268 /* Disable input DMA channel for the serial port in question 1268 /* Disable input DMA channel for the serial port in question
1269 * ( set to something other then serialX) 1269 * ( set to something other than serialX)
1270 */ 1270 */
1271 local_irq_save(flags); 1271 local_irq_save(flags);
1272 if (info->line == 0) { 1272 if (info->line == 0) {