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

Commit 846ce0a1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "bluetooth: Add check for CONFIG_CNSS_PCI"

parents 71e3d6cc afd85554

drivers/bluetooth/bluetooth-power.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2009-2010, 2013-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2009-2010, 2013-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -29,7 +29,7 @@ 
#include <linux/clk.h>

#include <linux/of_device.h>



#if defined(CONFIG_CNSS)

#if defined(CONFIG_CNSS_PCI)

#include <net/cnss.h>

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

};



#if defined(CONFIG_CNSS) && defined(CONFIG_CLD_LL_CORE)

#if defined(CONFIG_CNSS_PCI)

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

			char *buf)

{