[meta-lsi] [PATCH 32/41] linux-yocto-3.4: move config headers back to meta branch

[Daniel Dragomir]

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

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 .../conf/linux-yocto/linux-3.4/axxiaarm/common/common-non-hw.cfg      | 1 -
 .../linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common.scc       | 2 --
 .../conf/linux-yocto/linux-3.4/axxiapowerpc/common/common-non-hw.cfg  | 1 -
 .../linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common.scc   | 4 ----
 4 files changed, 8 deletions(-)

diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common-non-hw.cfg
index be2bd82..01b9f16 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common-non-hw.cfg
@@ -14,7 +14,6 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION_AUTO=y
 CONFIG_FHANDLE=y
 CONFIG_TASKSTATS=y
 CONFIG_AUDIT=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common.scc
index 1b979d1..4ad2563 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/common.scc
@@ -1,6 +1,4 @@
 include features/taskstats/taskstats.scc
-include features/usb/ehci-hcd.scc
-include cfg/usb-mass-storage.scc
 
 kconf hardware common-hw.cfg
 kconf non-hardware common-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common-non-hw.cfg
index 09756e8..0d5049a 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common-non-hw.cfg
@@ -14,7 +14,6 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 
 #
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common.scc
index 014157d..464f307 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/common.scc
@@ -1,6 +1,2 @@
-include features/usb/ehci-hcd.scc
-include cfg/usb-mass-storage.scc
-include cfg/timer/hz_100.scc
-
 kconf hardware common-hw.cfg
 kconf non-hardware common-non-hw.cfg
-- 
1.9.1