[kernel] r4735 - in dists/trunk/linux-2.6/debian: . arch/powerpc

[Simon Horman]

Author: horms
Date: 2005-11-07 09:06:38 +0000 (Mon, 07 Nov 2005)
New Revision: 4735

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/changelog
Log:
Redisable CONFIG_SOFTWARE_SUSPEND on ppc/miboot as it required
    CONFIG_PM to compile.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	2005-11-06 16:21:07 UTC (rev 4734)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	2005-11-07 09:06:38 UTC (rev 4735)
@@ -71,3 +71,5 @@
 
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_CRYPTO_MD5=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+ONFIG_SOFTWARE_SUSPEND=m

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-11-06 16:21:07 UTC (rev 4734)
+++ dists/trunk/linux-2.6/debian/changelog	2005-11-07 09:06:38 UTC (rev 4735)
@@ -22,12 +22,14 @@
     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 <nobse at debian.org>  Fri,  4 Nov 2005 10:45:06 +0100
+ -- Simon Horman <horms at debian.org>  Mon,  7 Nov 2005 18:05:10 +0900
 
 linux-2.6 (2.6.14-2) unstable; urgency=low