Merge branch 'next' into for-linus

[karo-tx-linux.git] / arch / arm / Kconfig-nommu

diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu
index f087376748d12253bb9f0414c6c742dfd6eb0b89..2cef8e13f9f83012c224c23802c383e4715a135f 100644 (file)
--- a/arch/arm/Kconfig-nommu
+++ b/arch/arm/Kconfig-nommu
@@ -26,7 +26,7 @@ config FLASH_SIZE
        default 0x00400000
 
 config PROCESSOR_ID
-       hex
+       hex 'Hard wire the processor ID'
        default 0x00007700
        depends on !CPU_CP15
        help
@@ -34,7 +34,7 @@ config PROCESSOR_ID
          used instead of the auto-probing which utilizes the register.
 
 config REMAP_VECTORS_TO_RAM
-       bool 'Install vectors to the begining of RAM' if DRAM_BASE
+       bool 'Install vectors to the beginning of RAM' if DRAM_BASE
        depends on DRAM_BASE
        help
          The kernel needs to change the hardware exception vectors.