Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[firefly-linux-kernel-4.4.55.git] / arch / m68knommu / Kconfig

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index e767f2ddae72a0ca59dabb0e6e16bbfcc8ea11e7..c1bc22c6d0d817e019a7022450b00425c52df587 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -161,8 +161,8 @@ config CLOCK_FREQ
          frequency, it may or may not be the same as the external clock
          crystal fitted to your board. Some processors have an internal
          PLL and can have their frequency programmed at run time, others
-         use internal dividers. In gernal the kernel won't setup a PLL
-         if it is fitted (there are some expections). This value will be
+         use internal dividers. In general the kernel won't setup a PLL
+         if it is fitted (there are some exceptions). This value will be
          specific to the exact CPU that you are using.
 
 config CLOCK_DIV
@@ -495,7 +495,7 @@ config VECTORBASE
        hex "Address of the base of system vectors"
        default "0"
        help
-         Define the address of the the system vectors. Commonly this is
+         Define the address of the system vectors. Commonly this is
          put at the start of RAM, but it doesn't have to be. On ColdFire
          platforms this address is programmed into the VBR register, thus
          actually setting the address to use.
@@ -565,7 +565,7 @@ config ROMVEC
        depends on ROM
        help
          This is almost always the same as the base of the ROM. Since on all
-         68000 type varients the vectors are at the base of the boot device
+         68000 type variants the vectors are at the base of the boot device
          on system startup.
 
 config ROMVECSIZE
@@ -574,7 +574,7 @@ config ROMVECSIZE
        depends on ROM
        help
          Define the size of the vector region in ROM. For most 68000
-         varients this would be 0x400 bytes in size. Set to 0 if you do
+         variants this would be 0x400 bytes in size. Set to 0 if you do
          not want a vector region at the start of the ROM.
 
 config ROMSTART