diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-02 13:50:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-02 13:50:49 +0100 |
| commit | 1a0bc22e751dc1a91073e47b61a4135cec549633 (patch) | |
| tree | 71d279d06dc068cc77cd360d45fd3599b962e3a0 /target/x86/kernel.config | |
| parent | 93f115b74d90ab06c101d37225fb6125d5dc33de (diff) | |
| parent | 0ccba89e05c01ce234adc7242ad7342d23b4f9df (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/x86/kernel.config')
| -rw-r--r-- | target/x86/kernel.config | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/target/x86/kernel.config b/target/x86/kernel.config index 1a6c964da..4b2c4bab0 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 -# Fri Nov 26 00:21:27 2010 +# Tue Nov 30 21:48:16 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -348,11 +348,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # -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_PM is not set # CONFIG_SFI is not set # |