From 71386be78c2aa85213db069cb842fc842c81a80a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 27 May 2014 11:26:14 +0200 Subject: enable 3.14.4 for cubox --- target/config/Config.in.kernelversion.choice | 1 - target/linux/config/Config.in.audio | 2 +- target/linux/config/Config.in.bluetooth | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index db081fff0..d826144c8 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -13,7 +13,6 @@ config ADK_KERNEL_VERSION_3_15_RC6 config ADK_KERNEL_VERSION_3_14_4 prompt "3.14.4" - depends on !ADK_TARGET_SYSTEM_CUBOX_I boolean select ADK_KERNEL_VERSION_3_14 diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index 6ce27a072..7ec1949e3 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -184,7 +184,7 @@ config ADK_KERNEL_SND_IMX_SOC select ADK_KERNEL_REGMAP_SPI select ADK_KERNEL_REGMAP_I2C depends on ADK_TARGET_SYSTEM_CUBOX_I - default m if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14 default n endmenu diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index b639676c1..352d73fad 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -82,7 +82,7 @@ config ADK_KERNEL_BT_HCIBTSDIO tristate select ADK_KERNEL_BT depends on ADK_TARGET_WITH_SDIO - default m if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14 default n help Bluetooth HCI SDIO driver. @@ -117,7 +117,7 @@ config ADK_KERNEL_BT_MRVL tristate select ADK_KERNEL_BT select ADK_PACKAGE_BRCM_BLUETOOTH - default m if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14 default n help Bluetooth Marvell driver. @@ -128,7 +128,7 @@ config ADK_KERNEL_BT_MRVL_SDIO depends on ADK_KERNEL_BT_MRVL depends on ADK_KERNEL_BT_HCIBTSDIO depends on ADK_TARGET_WITH_SDIO - default m if ADK_TARGET_SYSTEM_CUBOX_I + default m if ADK_TARGET_SYSTEM_CUBOX_I && !ADK_KERNEL_VERSION_3_14 default n help Bluetooth Marvell driver. -- cgit v1.2.3