summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-07-14 15:49:46 +0200
committerShawn Guo <shawnguo@kernel.org>2015-07-27 16:33:50 +0200
commit9559b3a38b26ab8410aeb822cf0596ea0b4adde4 (patch)
tree85afa00b40483c1faa0ddca484d7ca603af878e4
parentARM: imx: imx_v6_v7_defconfig enable imx6ul support (diff)
downloadlinux-9559b3a38b26ab8410aeb822cf0596ea0b4adde4.tar.xz
linux-9559b3a38b26ab8410aeb822cf0596ea0b4adde4.zip
ARM: imx_v6_v7_defconfig: Select CONFIG_IKCONFIG_PROC
It is useful to know how the kernel was configured via: zcat /proc/config.gz ,so select the CONFIG_IKCONFIG_PROC option. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index e1ba3e2d1332..a4ebc95c243c 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -3,6 +3,8 @@ CONFIG_SYSVIPC=y
CONFIG_FHANDLE=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=18
CONFIG_CGROUPS=y
CONFIG_RELAY=y
@@ -76,8 +78,8 @@ CONFIG_CAN=y
CONFIG_CAN_FLEXCAN=y
CONFIG_BT=y
CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_LL=y
CONFIG_CFG80211=y
CONFIG_MAC80211=y
CONFIG_RFKILL=y