r3536 - in trunk/kernel/source/linux-2.6-2.6.12/debian: .
arch/powerpc
Sven Luther
luther at costa.debian.org
Sat Jul 16 06:54:07 UTC 2005
Author: luther
Date: 2005-07-16 06:54:05 +0000 (Sat, 16 Jul 2005)
New Revision: 3536
Modified:
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp
trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
Log:
Disabled software suspend on powerpc-smp, as it is x86 cdentric on powerpc :(
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp 2005-07-16 05:23:49 UTC (rev 3535)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/powerpc/config.powerpc-smp 2005-07-16 06:54:05 UTC (rev 3536)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12
-# Fri Jul 15 10:07:06 2005
+# Sat Jul 16 06:49:33 2005
#
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
@@ -151,8 +151,7 @@
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
# CONFIG_PM_DEBUG is not set
-CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION=""
+# CONFIG_SOFTWARE_SUSPEND is not set
CONFIG_ISA_DMA_API=y
#
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/changelog 2005-07-16 05:23:49 UTC (rev 3535)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/changelog 2005-07-16 06:54:05 UTC (rev 3536)
@@ -47,5 +47,7 @@
needs some cleanup and tidying yet. (Sven Luther)
* Removed the ibmvscsi patch, as Christoph doesn't like it, and it failed to
build anyway. (Sven Luther)
+ * Disabled software suspend on powerpc-smp, as the smp code in software
+ suspend is amd64/i386 only. (Sven Luther)
-- Joshua Kwan <joshk at triplehelix.org> Sat, 16 Jul 2005 05:54:16 +0300
More information about the Kernel-svn-changes
mailing list