22 lines
622 B
Plaintext
22 lines
622 B
Plaintext
<<<<<<< HEAD
|
|
# Override some defaults so BT stack is enabled and
|
|
# Classic BT is enabled
|
|
CONFIG_BT_ENABLED=y
|
|
CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
|
|
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
|
|
CONFIG_BTDM_CTRL_MODE_BTDM=n
|
|
CONFIG_BT_BLUEDROID_ENABLED=y
|
|
CONFIG_BT_CLASSIC_ENABLED=y
|
|
CONFIG_BT_A2DP_ENABLE=y
|
|
=======
|
|
# Override some defaults so BT stack is enabled and
|
|
# Classic BT is enabled
|
|
CONFIG_BT_ENABLED=y
|
|
CONFIG_BTDM_CTRL_MODE_BLE_ONLY=n
|
|
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
|
|
CONFIG_BTDM_CTRL_MODE_BTDM=n
|
|
CONFIG_BT_BLUEDROID_ENABLED=y
|
|
CONFIG_BT_CLASSIC_ENABLED=y
|
|
CONFIG_BT_A2DP_ENABLE=y
|
|
>>>>>>> 4feb4c0a98bddb1f2a172ea4b195ce31ba18d442
|