mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -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: (28 commits) trivial: Update my email address trivial: NULL noise: drivers/mtd/tests/mtd_*test.c trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h trivial: Fix misspelling of "Celsius". trivial: remove unused variable 'path' in alloc_file() trivial: fix a pdlfush -> pdflush typo in comment trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL trivial: wusb: Storage class should be before const qualifier trivial: drivers/char/bsr.c: Storage class should be before const qualifier trivial: h8300: Storage class should be before const qualifier trivial: fix where cgroup documentation is not correctly referred to trivial: Give the right path in Documentation example trivial: MTD: remove EOL from MODULE_DESCRIPTION trivial: Fix typo in bio_split()'s documentation trivial: PWM: fix of #endif comment trivial: fix typos/grammar errors in Kconfig texts trivial: Fix misspelling of firmware trivial: cgroups: documentation typo and spelling corrections trivial: Update contact info for Jochen Hein trivial: fix typo "resgister" -> "register" ...
This commit is contained in:
commit
811158b147
109 changed files with 226 additions and 177 deletions
|
|
@ -438,7 +438,7 @@ config ETRAX_SERIAL_PORT0_DMA1_IN
|
|||
help
|
||||
Enables the DMA1 input channel for ser0 (ttyS0).
|
||||
If you do not enable DMA, an interrupt for each character will be
|
||||
used when receiveing data.
|
||||
used when receiving data.
|
||||
Normally you want to use DMA, unless you use the DMA channel for
|
||||
something else.
|
||||
|
||||
|
|
@ -565,7 +565,7 @@ config ETRAX_SERIAL_PORT2_DMA7_IN
|
|||
help
|
||||
Enables the DMA7 input channel for ser2 (ttyS2).
|
||||
If you do not enable DMA, an interrupt for each character will be
|
||||
used when receiveing data.
|
||||
used when receiving data.
|
||||
Normally you want to use DMA, unless you use the DMA channel for
|
||||
something else.
|
||||
|
||||
|
|
@ -604,7 +604,7 @@ config ETRAX_SERIAL_PORT3_DMA3_IN
|
|||
help
|
||||
Enables the DMA3 input channel for ser3 (ttyS3).
|
||||
If you do not enable DMA, an interrupt for each character will be
|
||||
used when receiveing data.
|
||||
used when receiving data.
|
||||
Normally you want to use DMA, unless you use the DMA channel for
|
||||
something else.
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ config ETRAX_NBR_LED_GRP_ONE
|
|||
help
|
||||
Select this if you want one Ethernet LED group. This LED group
|
||||
can be used for one or more Ethernet interfaces. However, it is
|
||||
recomended that each Ethernet interface use a dedicated LED group.
|
||||
recommended that each Ethernet interface use a dedicated LED group.
|
||||
|
||||
config ETRAX_NBR_LED_GRP_TWO
|
||||
bool "Use two LED groups"
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ config ETRAX_SERIAL_PORT4_DMA9_IN
|
|||
help
|
||||
Enables the DMA9 input channel for ser4 (ttyS4).
|
||||
If you do not enable DMA, an interrupt for each character will be
|
||||
used when receiveing data.
|
||||
used when receiving data.
|
||||
Normally you want to use DMA, unless you use the DMA channel for
|
||||
something else.
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ config ETRAX_SDRAM_GRP1_CONFIG
|
|||
depends on ETRAX_ARCH_V32
|
||||
default "0"
|
||||
help
|
||||
SDRAM configuration for group 1. The defult value is 0
|
||||
SDRAM configuration for group 1. The default value is 0
|
||||
because group 1 is not used in the default configuration,
|
||||
described in the help for SDRAM_GRP0_CONFIG.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue