diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-27 00:43:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-27 00:43:04 +0100 |
| commit | db40ed98b297d0550c6971b096c87bf0debf59b1 (patch) | |
| tree | 39bb950b98c4ca6292ce2850cd889c9ca1fd9eb6 /target/x86 | |
| parent | 45805efcda653a3e6d7577ac2956c8138b49c7fc (diff) | |
| parent | 83e2707a887a4c495a42f7e59f9f332df6b759ab (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/kernel.config | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target/x86/kernel.config b/target/x86/kernel.config index 80b42f0f6..1a6c964da 100644 --- a/target/x86/kernel.config +++ b/target/x86/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.36 -# Wed Nov 24 20:35:48 2010 +# Fri Nov 26 00:21:27 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -348,7 +348,11 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +# CONFIG_SUSPEND is not set +# CONFIG_PM_RUNTIME is not set +# CONFIG_ACPI is not set # CONFIG_SFI is not set # |