From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 10 Jul 2006 11:44:56 +0000 (-0700)
Subject: [PATCH] i386 defconfig: set CONFIG_PM_STD_PARTITION=""
X-Git-Tag: v2.6.18-rc2~174
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=11eebe307e4d3afa33eb25e999ac458ac4f9b41e;p=~shefty%2Frdma-dev.git

[PATCH] i386 defconfig: set CONFIG_PM_STD_PARTITION=""

Matthew Wilcox notified me that CONFIG_PM_STD_PARTITION="/dev/hda2" in the
i386 defconfig wasn't a good idea (especially since it prevented booting
for him due to another bug).

This patch sets CONFIG_PM_STD_PARTITION="" in the i386 defconfig.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Matthew Wilcox <willy@debian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 1629c3ac9be..89ebb7a316a 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -197,7 +197,7 @@ CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 CONFIG_SOFTWARE_SUSPEND=y
-CONFIG_PM_STD_PARTITION="/dev/hda2"
+CONFIG_PM_STD_PARTITION=""
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support