diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-12 03:06:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-09-12 03:06:02 +0200 |
| commit | ea46d21dcbecbebcee1224453cc0a8075cfa8ea7 (patch) | |
| tree | 01911d47ac5950676d51f1afb1927b1aa3ed5bcb /target/linux | |
| parent | 2107786864b28f77568828cec97347d78f298f99 (diff) | |
| parent | 4d8e57a9ba0a95bd0c9c461ee8f6345d0f4b43fc (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.bluetooth | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 8785d8c07..12c0b3d68 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -224,7 +224,7 @@ config ADK_KERNEL_SND_IMX_SOC select ADK_KERNEL_SND_PCM_DMAENGINE depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_14 - default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n endmenu diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 537e0c741..64226aba6 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -116,8 +116,6 @@ config ADK_KERNEL_BT_MRVL prompt "Marvell driver" tristate select ADK_KERNEL_BT - select ADK_PACKAGE_BRCM_BLUETOOTH - default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help Bluetooth Marvell driver. @@ -125,8 +123,9 @@ config ADK_KERNEL_BT_MRVL config ADK_KERNEL_BT_MRVL_SDIO prompt "Marvell SDIO driver" tristate - depends on ADK_KERNEL_BT_MRVL - depends on ADK_KERNEL_BT_HCIBTSDIO + select ADK_PACKAGE_BRCM_BLUETOOTH + select ADK_KERNEL_BT_MRVL + select ADK_KERNEL_BT_HCIBTSDIO depends on ADK_TARGET_WITH_SDIO default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n |