Fold debian/config/armel/config-tiny into config.ixp4xx

Now that iop32x is gone, only ixp4xx needs these overrides.

svn path=/dists/trunk/linux/; revision=21229

3 files changed, 10 insertions, 14 deletions

diff --git a/debian/config/armel/config-tiny b/debian/config/armel/config-tiny
deleted file mode 100644
index e3f8cdfa198d..000000000000
--- a/debian/config/armel/config-tiny
+++ /dev/null
@@ -1,13 +0,0 @@
-##
-## file: init/Kconfig
-##
-#. Saves about 5K
-# CONFIG_USER_NS is not set
-#. Saves about 7K
-# CONFIG_MEMCG is not set
-
-##
-## file: net/Kconfig
-##
-#. Saves about 3K
-# CONFIG_BPF_JIT is not set
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index ea4ce4a376c2..5a7d971133b6 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -672,6 +672,10 @@ CONFIG_BINFMT_AOUT=m
 ## file: init/Kconfig
 ##
 CONFIG_LOG_BUF_SHIFT=14
+#. Saves about 7K
+# CONFIG_MEMCG is not set
+#. Saves about 5K
+# CONFIG_USER_NS is not set
 
 ##
 ## file: lib/Kconfig.debug
@@ -688,6 +692,12 @@ CONFIG_FLATMEM_MANUAL=y
 ## end choice
 
 ##
+## file: net/Kconfig
+##
+#. Saves about 3K
+# CONFIG_BPF_JIT is not set
+
+##
 ## file: net/ax25/Kconfig
 ##
 CONFIG_HAMRADIO=y
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 3d8ad9255427..1fa59829f7d5 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -27,7 +27,6 @@ hardware-long: IXP4xx based systems (Linksys NSLU2, etc)
 check-size: 1441760
 configs:
  armel/config-reduced
- armel/config-tiny
  armel/config.ixp4xx
 
 [kirkwood_build]