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

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

Merge "cnss: sort include files"

parents 172f292f f44accc6

arch/arm64/boot/dts/qcom/qcs405.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -63,19 +63,19 @@ 
			reg = <0x0 0x86400000 0x0 0x1000000>;

		};



		adsp_fw_mem: adsp_fw_mem@87500000 {

		adsp_fw_mem: adsp_fw_mem@87400000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x87400000 0x0 0x1400000>;

		};



		cdsp_fw_mem: cdsp_fw_mem@88f00000 {

		cdsp_fw_mem: cdsp_fw_mem@88800000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x88800000 0x0 0x600000>;

		};



		wlan_msa_mem: wlan_msa_region@89500000 {

		wlan_msa_mem: wlan_msa_region@88E00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x88E00000 0x0 0x100000>;

drivers/net/wireless/cnss_utils/cnss_utils.c

+3 −3
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 


#define pr_fmt(fmt) "cnss_utils: " fmt



#include <linux/module.h>

#include <linux/debugfs.h>

#include <linux/etherdevice.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/etherdevice.h>

#include <linux/debugfs.h>

#include <net/cnss_utils.h>



#define CNSS_MAX_CH_NUM 45