[meta-lsi] [PATCH 30/41] linux-yocto-3.4: update github defconfigs

[Daniel Dragomir]

From: Cristian Bercaru <cristian.bercaru at windriver.com>

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 .../linux/conf/lsi-tip/linux-3.4/axxiaarm/preempt-rt/defconfig         | 3 ++-
 .../linux/conf/lsi-tip/linux-3.4/axxiapowerpc/preempt-rt/defconfig     | 2 +-
 .../linux/conf/lsi-tip/linux-3.4/axxiapowerpc/standard/defconfig       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiaarm/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiaarm/preempt-rt/defconfig
index 45e66fe..d95c591 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiaarm/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiaarm/preempt-rt/defconfig
@@ -38,7 +38,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
@@ -763,6 +763,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 CONFIG_LSI_MTC=y
+CONFIG_LSI_NCR=y
 CONFIG_LSI_SMMON=y
 # CONFIG_C2PORT is not set
 
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/preempt-rt/defconfig
index 5e6549f..791c007 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/preempt-rt/defconfig
@@ -84,7 +84,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE="powerpc-linux-"
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/standard/defconfig
index d7a4d18..9b09f10 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.4/axxiapowerpc/standard/defconfig
@@ -83,7 +83,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE="powerpc-linux-"
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
-- 
1.9.1