[linux] 05/05: [armel] Fold config-reduced into config.marvell

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch benh/armel-marvell-flavour
in repository linux.

commit 64eff95e20226b79430f080051a501b94e3ed609
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 27 17:00:41 2016 +0000

    [armel] Fold config-reduced into config.marvell
---
 debian/config/armel/config-reduced | 75 --------------------------------------
 debian/config/armel/config.marvell | 71 ++++++++++++++++++++++++++++++++++++
 debian/config/armel/defines        |  3 --
 3 files changed, 71 insertions(+), 78 deletions(-)

diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced
deleted file mode 100644
index c6d10b2..0000000
--- a/debian/config/armel/config-reduced
+++ /dev/null
@@ -1,75 +0,0 @@
-##
-## file: arch/Kconfig
-##
-# CONFIG_KPROBES is not set
-## choice: Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-## end choice
-
-##
-## file: block/Kconfig.iosched
-##
-CONFIG_IOSCHED_DEADLINE=m
-
-##
-## file: crypto/Kconfig
-##
-# CONFIG_CRYPTO_FIPS is not set
-
-##
-## file: drivers/gpu/vga/Kconfig
-##
-# CONFIG_VGA_ARB is not set
-
-##
-## file: init/Kconfig
-##
-#. Saves about 7K
-# CONFIG_MEMCG is not set
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_PROFILING is not set
-
-##
-## file: kernel/power/Kconfig
-##
-# CONFIG_SUSPEND is not set
-# CONFIG_HIBERNATION is not set
-# CONFIG_PM is not set
-
-##
-## file: mm/Kconfig
-##
-#. Saves about 7K
-# CONFIG_COMPACTION is not set
-# CONFIG_KSM is not set
-
-##
-## file: net/Kconfig
-##
-#. Saves about 3K
-# CONFIG_BPF_JIT is not set
-
-##
-## file: net/ipv6/Kconfig
-##
-CONFIG_IPV6=m
-
-##
-## file: net/mpls/Kconfig
-##
-# CONFIG_NET_MPLS_GSO is not set
-
-##
-## file: net/netlink/Kconfig
-##
-# CONFIG_NETLINK_MMAP is not set
-
-##
-## file: usr/Kconfig
-##
-# CONFIG_RD_LZO is not set
-# CONFIG_RD_LZ4 is not set
-
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 588eeb7..6d5750f 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -1,4 +1,13 @@
 ##
+## file: arch/Kconfig
+##
+# CONFIG_KPROBES is not set
+## choice: Stack Protector buffer overflow detection
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+## end choice
+
+##
 ## file: arch/arm/Kconfig
 ##
 CONFIG_ARCH_MULTI_V5=y
@@ -78,6 +87,11 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 
 ##
+## file: block/Kconfig.iosched
+##
+CONFIG_IOSCHED_DEADLINE=m
+
+##
 ## file: block/partitions/Kconfig
 ##
 CONFIG_ACORN_PARTITION=y
@@ -102,6 +116,11 @@ CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 
 ##
+## file: crypto/Kconfig
+##
+# CONFIG_CRYPTO_FIPS is not set
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
@@ -197,6 +216,11 @@ CONFIG_MV_XOR=y
 # CONFIG_DRM is not set
 
 ##
+## file: drivers/gpu/vga/Kconfig
+##
+# CONFIG_VGA_ARB is not set
+
+##
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_SENSORS_G760A=m
@@ -639,6 +663,23 @@ CONFIG_FB=m
 CONFIG_ORION_WATCHDOG=m
 
 ##
+## file: init/Kconfig
+##
+#. Saves about 7K
+# CONFIG_MEMCG is not set
+# CONFIG_CFS_BANDWIDTH is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_PROFILING is not set
+
+##
+## file: kernel/power/Kconfig
+##
+# CONFIG_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM is not set
+
+##
 ## file: kernel/trace/Kconfig
 ##
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
@@ -653,6 +694,15 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
+#. Saves about 7K
+# CONFIG_COMPACTION is not set
+# CONFIG_KSM is not set
+
+##
+## file: net/Kconfig
+##
+#. Saves about 3K
+# CONFIG_BPF_JIT is not set
 
 ##
 ## file: net/atm/Kconfig
@@ -669,6 +719,21 @@ CONFIG_NETROM=m
 CONFIG_ROSE=m
 
 ##
+## file: net/ipv6/Kconfig
+##
+CONFIG_IPV6=m
+
+##
+## file: net/mpls/Kconfig
+##
+# CONFIG_NET_MPLS_GSO is not set
+
+##
+## file: net/netlink/Kconfig
+##
+# CONFIG_NETLINK_MMAP is not set
+
+##
 ## file: sound/soc/Kconfig
 ##
 CONFIG_SND_SOC=m
@@ -690,3 +755,9 @@ CONFIG_SND_SIMPLE_CARD=m
 ##
 CONFIG_SND_KIRKWOOD_SOC=m
 
+##
+## file: usr/Kconfig
+##
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 688c89a..7913c37 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -33,9 +33,6 @@ recommends: u-boot-tools
 check-size: 2097080
 check-size-with-dtb: true
 breaks: flash-kernel (<< 3.37~)
-configs:
- armel/config-reduced
- armel/config.marvell
 
 [versatile_description]
 hardware: Versatile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git