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

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

Merge "wireless: wcnss: compilation fixes for 64-bit platforms"

parents 656d8be9 00bcd852

arch/arm/mach-msm/include/mach/board.h

+0 −1
Original line number Diff line number Diff line
@@ -700,5 +700,4 @@ int smd_debugfs_init(void); 
static inline int smd_debugfs_init(void) { return 0; }

#endif



u32 wcnss_rf_read_reg(u32 rf_reg_addr);

#endif

drivers/net/wireless/wcnss/wcnss_vreg.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/list.h>

#include <linux/slab.h>

#include <linux/clk.h>

#include <mach/msm_xo.h>

#include <mach/msm_iomap.h>





static void __iomem *msm_wcnss_base;

drivers/net/wireless/wcnss/wcnss_wlan.c

+0 −4
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ 
#include <soc/qcom/subsystem_notif.h>

#include <soc/qcom/smd.h>



#include <mach/board.h>

#include <mach/msm_iomap.h>



#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC

#include "wcnss_prealloc.h"
@@ -850,8 +848,6 @@ void wcnss_reset_intr(void) 
		__raw_writel(1 << 16, penv->fiq_reg);

	} else {

		wcnss_riva_log_debug_regs();

		wmb();

		__raw_writel(1 << 24, MSM_APCS_GCC_BASE + 0x8);

	}

}

EXPORT_SYMBOL(wcnss_reset_intr);

include/soc/qcom/subsystem_restart.h

+1 −0
Original line number Diff line number Diff line
@@ -147,4 +147,5 @@ static inline void notify_proxy_vote(struct device *device) { } 
static inline void notify_proxy_unvote(struct device *device) { }

#endif /* CONFIG_MSM_SUBSYSTEM_RESTART */



u32 wcnss_rf_read_reg(u32 rf_reg_addr);

#endif