From 5f5a7e85c6882c74c87f5ffae63f97e0596ade3e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 9 Aug 2014 19:18:16 +0000 Subject: [PATCH] [armel] Re-enable ixp4xx flavour The last changes to config.reduced also allow ixp4xx to fit within its limit again. svn path=/dists/trunk/linux/; revision=21719 --- debian/changelog | 7 ++++--- debian/config/armel/defines | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c58b24ecd..fbbea7a47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,11 +25,12 @@ linux (3.16-1~exp1) UNRELEASED; urgency=medium * [arm*,ia64,ppc64el,s390*,sh4] Disable SYSFS_SYSCALL, only needed for SVR4 compatibility * [armel] Disable BINFMT_AOUT + * [armel] Re-enable ixp4xx flavour * [armel] Change configuration to reduce kernel image size - [/kirkwood] Change IPV6 to module - - [/orion5x] Change IOSCHED_DEADLINE to module - - [/orion5x] Disable SECURITY (i.e. Linux Security Modules, including - SELinux) + - [/ixp4xx,orion5x] Change IOSCHED_DEADLINE to module + - [/ixp4xx,orion5x] Disable SECURITY (i.e. Linux Security Modules, + including SELinux) -- Aurelien Jarno Thu, 31 Jul 2014 20:56:06 +0200 diff --git a/debian/config/armel/defines b/debian/config/armel/defines index 6e8e9094a..c4e701b85 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -1,6 +1,6 @@ [base] flavours: -# ixp4xx + ixp4xx kirkwood mv78xx0 orion5x