diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/i386/defconfig | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/defconfig')
| -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 |