diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/config/Config.in.cpu | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.cpu')
| -rw-r--r-- | target/linux/config/Config.in.cpu | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index 075d46565..71b32b963 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -9,11 +9,6 @@ config ADK_KERNEL_PM_SLEEP_SMP 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 @@ -57,15 +52,17 @@ config ADK_KERNEL_ARM_IMX6_CPUFREQ select ADK_KERNEL_REGULATOR select ADK_KERNEL_REGULATOR_FIXED_VOLTAGE select ADK_KERNEL_REGULATOR_ANATOP - default y if ADK_TARGET_SYSTEM_CUBOX_I depends on ADK_TARGET_SYSTEM_CUBOX_I + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n config ADK_KERNEL_ARM_BCM2835_CPUFREQ prompt "CPU frequency support for raspberry-pi" boolean select ADK_KERNEL_CPU_FREQ - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n choice prompt "Governor" |