From 1d9aac96b07d91a8e42b7623baa2b53bf2c16898 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 7 Nov 2005 09:06:38 +0000 Subject: [PATCH] Redisable CONFIG_SOFTWARE_SUSPEND on ppc/miboot as it required CONFIG_PM to compile. svn path=/dists/trunk/linux-2.6/; revision=4735 --- debian/arch/powerpc/config.powerpc-miboot | 2 ++ debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/arch/powerpc/config.powerpc-miboot b/debian/arch/powerpc/config.powerpc-miboot index cd3204741..9fac8f4b4 100644 --- a/debian/arch/powerpc/config.powerpc-miboot +++ b/debian/arch/powerpc/config.powerpc-miboot @@ -71,3 +71,5 @@ CONFIG_PCMCIA_XIRTULIP=m CONFIG_BROKEN_ON_SMP=y CONFIG_CRYPTO_MD5=y +# CONFIG_SOFTWARE_SUSPEND is not set +ONFIG_SOFTWARE_SUSPEND=m diff --git a/debian/changelog b/debian/changelog index ec4aace9d..3d70eae83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,12 +22,14 @@ linux-2.6 (2.6.14-3) UNRELEASED; urgency=low debian-specific patch to make it modular, make fbcons builtin too, else all sorts of weird stuff happens which is hard for the inird builders to automatically compenste for. (Closes: #336450) + * Redisable CONFIG_SOFTWARE_SUSPEND on ppc/miboot as it required + CONFIG_PM to compile. [ dann frazier ] * net-ipconntrack-nat-fix.patch - fix compilation of ip_conntrack_helper_pptp.c when NAT is disabled. (Closes: #336431) - -- Norbert Tretkowski Fri, 4 Nov 2005 10:45:06 +0100 + -- Simon Horman Mon, 7 Nov 2005 18:05:10 +0900 linux-2.6 (2.6.14-2) unstable; urgency=low