diff --git a/ChangeLog b/ChangeLog index 055d540aeaf..ee37fbdd33b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -17445,7 +17445,7 @@ * The lcdrw example has been removed because it violates the portable OS interface (2017-10-14). * All configurations that use NXIMAGE or NXHELLO must select - NX_MULTIUSER. All configuratinos that use examples/nxterm must enable + NX_MULTIUSER. All configurations that use examples/nxterm must enable CONFIG_LIB_BOARDCTL (2017-10-14). * configs/stm32f103-minimum: Add support for LM75 in the stm32f103-minimum board. From Alan Carvalho de Assis (2017-10-14). diff --git a/ReleaseNotes b/ReleaseNotes index d3302c654ec..aaa960e9961 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -16669,7 +16669,7 @@ detailed bugfix information): * Examples/Tests: apps/examples: - All configurations that use NXIMAGE or NXHELLO must select - NX_MULTIUSER. All configuratinos that use examples/nxterm must + NX_MULTIUSER. All configurations that use examples/nxterm must enable CONFIG_LIB_BOARDCTL. - All configurations that use NXLINES must select NX_MULTIUSER. All configurations that use the NX server need to have larger POSIX diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig index ae701198f14..35f4efe98c0 100644 --- a/arch/arm/src/sama5/Kconfig +++ b/arch/arm/src/sama5/Kconfig @@ -165,7 +165,7 @@ config SAMA5_HAVE_VDEC bool default n -# Summary configuratinos +# Summary configurations config SAMA5_FLEXCOM bool diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index e2ff6dea794..80ce719c802 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -1737,7 +1737,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf) #ifdef CONFIG_SAMV7_QSPI if (intf == 0) { - /* If this function is called multiple times, the following operatinos + /* If this function is called multiple times, the following operations * will be performed multiple times. */