mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) trivial: chack -> check typo fix in main Makefile trivial: Add a space (and a comma) to a printk in 8250 driver trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx trivial: Fix misspelling of "firmware" in powerpc Makefile trivial: Fix misspelling of "firmware" in usb.c trivial: Fix misspelling of "firmware" in qla1280.c trivial: Fix misspelling of "firmware" in a100u2w.c trivial: Fix misspelling of "firmware" in megaraid.c trivial: Fix misspelling of "firmware" in ql4_mbx.c trivial: Fix misspelling of "firmware" in acpi_memhotplug.c trivial: Fix misspelling of "firmware" in ipw2100.c trivial: Fix misspelling of "firmware" in atmel.c trivial: Fix misspelled firmware in Kconfig trivial: fix an -> a typos in documentation and comments trivial: fix then -> than typos in comments and documentation trivial: update Jesper Juhl CREDITS entry with new email trivial: fix singal -> signal typo trivial: Fix incorrect use of "loose" in event.c trivial: printk: fix indentation of new_text_line declaration trivial: rtc-stk17ta8: fix sparse warning ...
This commit is contained in:
commit
57c44c5f6f
99 changed files with 133 additions and 130 deletions
|
|
@ -3123,7 +3123,7 @@ static int __init serial8250_init(void)
|
|||
if (nr_uarts > UART_NR)
|
||||
nr_uarts = UART_NR;
|
||||
|
||||
printk(KERN_INFO "Serial: 8250/16550 driver"
|
||||
printk(KERN_INFO "Serial: 8250/16550 driver, "
|
||||
"%d ports, IRQ sharing %sabled\n", nr_uarts,
|
||||
share_irqs ? "en" : "dis");
|
||||
|
||||
|
|
|
|||
|
|
@ -1203,7 +1203,7 @@ static void e100_disable_txdma_channel(struct e100_serial *info)
|
|||
unsigned long flags;
|
||||
|
||||
/* Disable output DMA channel for the serial port in question
|
||||
* ( set to something other then serialX)
|
||||
* ( set to something other than serialX)
|
||||
*/
|
||||
local_irq_save(flags);
|
||||
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)
|
|||
unsigned long flags;
|
||||
|
||||
/* Disable input DMA channel for the serial port in question
|
||||
* ( set to something other then serialX)
|
||||
* ( set to something other than serialX)
|
||||
*/
|
||||
local_irq_save(flags);
|
||||
if (info->line == 0) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue