Redisable CONFIG_SOFTWARE_SUSPEND on ppc/miboot as it required

CONFIG_PM to compile.

svn path=/dists/trunk/linux-2.6/; revision=4735
This commit is contained in:
Simon Horman 2005-11-07 09:06:38 +00:00
parent bc5422b008
commit 1d9aac96b0
2 changed files with 5 additions and 1 deletions

View File

@ -71,3 +71,5 @@ CONFIG_PCMCIA_XIRTULIP=m
CONFIG_BROKEN_ON_SMP=y CONFIG_BROKEN_ON_SMP=y
CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MD5=y
# CONFIG_SOFTWARE_SUSPEND is not set
ONFIG_SOFTWARE_SUSPEND=m

4
debian/changelog vendored
View File

@ -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 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 all sorts of weird stuff happens which is hard for the inird builders to
automatically compenste for. (Closes: #336450) automatically compenste for. (Closes: #336450)
* Redisable CONFIG_SOFTWARE_SUSPEND on ppc/miboot as it required
CONFIG_PM to compile.
[ dann frazier ] [ dann frazier ]
* net-ipconntrack-nat-fix.patch - fix compilation of * net-ipconntrack-nat-fix.patch - fix compilation of
ip_conntrack_helper_pptp.c when NAT is disabled. (Closes: #336431) ip_conntrack_helper_pptp.c when NAT is disabled. (Closes: #336431)
-- Norbert Tretkowski <nobse@debian.org> Fri, 4 Nov 2005 10:45:06 +0100 -- Simon Horman <horms@debian.org> Mon, 7 Nov 2005 18:05:10 +0900
linux-2.6 (2.6.14-2) unstable; urgency=low linux-2.6 (2.6.14-2) unstable; urgency=low