diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-04-03 22:57:01 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-04-03 22:57:01 +0200 |
| commit | 5b940999b01a7f41490700177289cccaaa942e30 (patch) | |
| tree | 8c253f1d789b91ffe2140e1ae2cfc40529435895 /target/linux | |
| parent | 1b579f2666a0d3d1076540c7c15714e6ec773df5 (diff) | |
| parent | 67b8b43f6d34c2a06eb7c06be481b7fd5fb11829 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.audio | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 7566b8cdd..5fc901854 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -207,7 +207,7 @@ config ADK_KERNEL_SND_IMX_SOC select ADK_KERNEL_SND_SOC_IMX_HDMI_DMA select ADK_KERNEL_SND_SOC_IMX_HDMI select ADK_KERNEL_SND_SOC_IMX_SPDIF - select ADK_KERNEL_SND_SOC_IMX_SGTL5000 + select ADK_KERNEL_SND_SOC_IMX_SGTL5000 if ADK_TARGET_HUMMINGBOARD_I2EX select ADK_KERNEL_SND_SOC_FSL_ASRC select ADK_KERNEL_SND_SOC_FSL_SPDIF select ADK_KERNEL_REGMAP_SPI diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 9583beeff..95904d9af 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -198,11 +198,11 @@ config ADK_KERNEL_VFPv4 config ADK_KERNEL_NEON bool - default y if ADK_TARGET_CPU_WITH_NEON + default y if ADK_TARGET_ARCH_ARM_WITH_NEON config ADK_KERNEL_MODE_NEON bool - default y if ADK_TARGET_CPU_WITH_NEON + default y if ADK_TARGET_ARCH_ARM_WITH_NEON config ADK_TARGET_NO_CMDLINE bool "Do not builtin any kernel cmdline" |