diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/arm/configs/versatile_defconfig | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/arm/configs/versatile_defconfig')
| -rw-r--r-- | arch/arm/configs/versatile_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig index 96b7a7762426..f7bf6ef27d19 100644 --- a/arch/arm/configs/versatile_defconfig +++ b/arch/arm/configs/versatile_defconfig | |||
| @@ -200,7 +200,7 @@ CONFIG_BINFMT_ELF=y | |||
| 200 | # Power management options | 200 | # Power management options |
| 201 | # | 201 | # |
| 202 | CONFIG_PM=y | 202 | CONFIG_PM=y |
| 203 | CONFIG_PM_LEGACY=y | 203 | # CONFIG_PM_LEGACY is not set |
| 204 | # CONFIG_PM_DEBUG is not set | 204 | # CONFIG_PM_DEBUG is not set |
| 205 | # CONFIG_APM is not set | 205 | # CONFIG_APM is not set |
| 206 | 206 | ||