diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
| commit | 4a54d9dd804bc3b64703ba04060ec8c48a8c9811 (patch) | |
| tree | 948f1b2bead3d128603ad5a34609205db61da3aa /target/linux/config/Config.in.cpu | |
| parent | e61aad237ecb819635bb7550dbbf66f2b8817b50 (diff) | |
| parent | 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/config/Config.in.cpu')
| -rw-r--r-- | target/linux/config/Config.in.cpu | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 64d9e9f3f..5be6dacfc 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -11,3 +11,24 @@ config ADK_KERNEL_MTRR boolean default y if ADK_TARGET_CPU_WITH_MTRR default n + +# hyper threading +config ADK_KERNEL_PM_SLEEP_SMP + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n + +config ADK_KERNEL_SMP + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n + +config ADK_KERNEL_X86_HT + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n + +config ADK_KERNEL_USE_GENERIC_SMP_HELPERS + boolean + default y if ADK_TARGET_CPU_WITH_HT + default n |