From 921846731e1f47d3f579b48448e9b147aa8f44c7 Mon Sep 17 00:00:00 2001 From: Morten Priess Date: Tue, 24 Jan 2023 15:28:20 +0100 Subject: [PATCH] Bluetooth: controller: Hotfix auto-merge error Remove introduced duplicate mock function. Signed-off-by: Morten Priess --- tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c b/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c index daf70974a4..f18e9cfbeb 100644 --- a/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c +++ b/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c @@ -86,8 +86,3 @@ void ull_conn_iso_start(struct ll_conn *acl, uint32_t ticks_at_expire, uint16_t { } - -struct ll_conn_iso_stream *ll_iso_stream_connected_get(uint16_t handle) -{ - return NULL; -}