From ba831b83d4030c5da6b5405c11aff22d5c8d6826 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 10 Dec 2014 20:32:26 +0000
Subject: [PATCH] [armel] Disable more config symbols on both kirkwood and
 orion5x

svn path=/dists/trunk/linux/; revision=22187
---
 debian/changelog                   |  5 ++++-
 debian/config/armel/config-reduced | 25 +++++++++++++++++++++++++
 debian/config/armel/config.orion5x | 25 -------------------------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0d59d100..2532afe1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,7 +46,10 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
   * [armel] Change configuration to reduce kernel image size (fixes FTBFS)
     - [/kirkwood] netlink: Disable NETLINK_MMAP
     - [/kirkwood] cgroups: Disable MEMCG
-    - [/kirkwood] Disable CHECKPOINT_RESTORE
+    - [/kirkwood] Disable CHECKPOINT_RESTORE, RD_LZ4
+    - [/kirkwood] mm: Disable COMPACTION, KSM
+    - [/kirkwood] crypto: Disable CRYPTO_FIPS
+    - [/kirkwood] power: Disable HIBERNATION, PM_RUNTIME
     - [/orion5x] mm: Disable COMPACTION, MIGRATION
     - [/orion5x] block: Disable BLK_DEV_INTEGRITY
     - [/orion5x] SCSI: Disable SCSI_UFSHCD
diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced
index 0b2580142..865f04835 100644
--- a/debian/config/armel/config-reduced
+++ b/debian/config/armel/config-reduced
@@ -3,6 +3,11 @@
 ##
 CONFIG_IOSCHED_DEADLINE=m
 
+##
+## file: crypto/Kconfig
+##
+# CONFIG_CRYPTO_FIPS is not set
+
 ##
 ## file: drivers/gpu/vga/Kconfig
 ##
@@ -15,19 +20,39 @@ CONFIG_IOSCHED_DEADLINE=m
 # CONFIG_MEMCG 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_RUNTIME is not set
+
+##
+## file: mm/Kconfig
+##
+#. Saves about 7K
+# CONFIG_COMPACTION is not set
+# CONFIG_KSM 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_LZ4 is not set
+
diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x
index 670158465..0bc06515e 100644
--- a/debian/config/armel/config.orion5x
+++ b/debian/config/armel/config.orion5x
@@ -87,11 +87,6 @@ CONFIG_SGI_PARTITION=y
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 
-##
-## file: crypto/Kconfig
-##
-# CONFIG_CRYPTO_FIPS is not set
-
 ##
 ## file: drivers/ata/Kconfig
 ##
@@ -568,13 +563,6 @@ CONFIG_ORION_WATCHDOG=m
 # CONFIG_USER_NS is not set
 #. Saves about 17K, and none of the quirks are likely to be needed
 # CONFIG_PCI_QUIRKS is not set
-# CONFIG_PROFILING is not set
-
-##
-## file: kernel/power/Kconfig
-##
-# CONFIG_HIBERNATION is not set
-# CONFIG_PM_RUNTIME is not set
 
 ##
 ## file: kernel/trace/Kconfig
@@ -596,9 +584,6 @@ 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
 # CONFIG_FRONTSWAP is not set
 # CONFIG_ZSMALLOC is not set
 
@@ -622,18 +607,8 @@ CONFIG_AX25=m
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-##
-## file: net/mpls/Kconfig
-##
-# CONFIG_NET_MPLS_GSO is not set
-
 ##
 ## file: security/Kconfig
 ##
 # CONFIG_SECURITY is not set
 
-##
-## file: usr/Kconfig
-##
-# CONFIG_RD_LZ4 is not set
-