Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf71eca authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Bluetooth: Fix compile issue when both CONFIG_CNSS and CONFIG_ICNSS enabled"

parents f469a721 57a7b626

drivers/bluetooth/bluetooth-power.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/regulator/consumer.h>

#include <linux/clk.h>



#if defined(CONFIG_CNSS)

#if defined(CONFIG_CNSS) && !defined(CONFIG_ICNSS)

#include <net/cnss.h>

#endif
@@ -338,7 +338,7 @@ static const struct rfkill_ops bluetooth_power_rfkill_ops = { 
	.set_block = bluetooth_toggle_radio,

};



#if defined(CONFIG_CNSS)

#if defined(CONFIG_CNSS) && !defined(CONFIG_ICNSS)

static ssize_t enable_extldo(struct device *dev, struct device_attribute *attr,

			char *buf)

{