diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-06-25 17:55:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:32 -0400 |
| commit | 648be3188135add682349e86d46d07cc11c8eb57 (patch) | |
| tree | d6c4b7e1408baebb97dc4cd8d7a435ac3eb4cad0 /arch/i386/defconfig | |
| parent | fc5fb2c609c6acef15a8b062063e9135fb08b4d2 (diff) | |
[PATCH] swsusp: kill config_pm_disk
CONFIG_PM_DISK is long gone, but it still managed to survived at few
places.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/defconfig')
| -rw-r--r-- | arch/i386/defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 28e620383799..ca07b95c06b8 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
| @@ -126,7 +126,6 @@ CONFIG_HAVE_DEC_LOCK=y | |||
| 126 | # | 126 | # |
| 127 | CONFIG_PM=y | 127 | CONFIG_PM=y |
| 128 | CONFIG_SOFTWARE_SUSPEND=y | 128 | CONFIG_SOFTWARE_SUSPEND=y |
| 129 | # CONFIG_PM_DISK is not set | ||
| 130 | 129 | ||
| 131 | # | 130 | # |
| 132 | # ACPI (Advanced Configuration and Power Interface) Support | 131 | # ACPI (Advanced Configuration and Power Interface) Support |