diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-08 12:22:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-08 12:22:21 +0100 |
| commit | 8030ab24fa042a356b958dd1ccf0338b0d2c8418 (patch) | |
| tree | a6882bc2b56ca6120ed450aa2d860361a88b8025 /arch/arm/mach-mxs | |
| parent | 6d7dcfbccfa2a42b16eb7529a3785fdac25c8705 (diff) | |
| parent | c209c186e0e4f3bb5731ae4593350e0bc8554bcd (diff) | |
| download | barebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.gz barebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.xz | |
Merge branch 'kconfig'
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index ff295f144c..853d81a0c4 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -84,7 +84,7 @@ endchoice endif -menu "i.MX specific settings " +menu "i.MX specific settings" config MXS_OCOTP tristate "OCOTP device" @@ -105,7 +105,7 @@ config MXS_OCOTP_WRITABLE Before being actually able to blow the bits, you need to explicitely enable writing: - ocotp0.permanent_write_enable=1 + ocotp0.permanent_write_enable=1 config MXS_CMD_BCB depends on NAND_MXS @@ -117,7 +117,7 @@ config MXS_CMD_BCB endmenu -menu "Board specific settings " +menu "Board specific settings" if MACH_TX28 |