diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-07-10 07:44:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:22 -0400 |
| commit | 11eebe307e4d3afa33eb25e999ac458ac4f9b41e (patch) | |
| tree | 8a5d8bd3c35ca25aed80be16b99df80d9654bac9 | |
| parent | 84e8cd6dbc00b4979e8d1c15c80d91987aeb3417 (diff) | |
[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>
| -rw-r--r-- | arch/i386/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 1629c3ac9bee..89ebb7a316ab 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
| @@ -197,7 +197,7 @@ CONFIG_PM=y | |||
| 197 | # CONFIG_PM_LEGACY is not set | 197 | # CONFIG_PM_LEGACY is not set |
| 198 | # CONFIG_PM_DEBUG is not set | 198 | # CONFIG_PM_DEBUG is not set |
| 199 | CONFIG_SOFTWARE_SUSPEND=y | 199 | CONFIG_SOFTWARE_SUSPEND=y |
| 200 | CONFIG_PM_STD_PARTITION="/dev/hda2" | 200 | CONFIG_PM_STD_PARTITION="" |
| 201 | 201 | ||
| 202 | # | 202 | # |
| 203 | # ACPI (Advanced Configuration and Power Interface) Support | 203 | # ACPI (Advanced Configuration and Power Interface) Support |