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

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

Merge "msm: Update config name of function-1 driver"

parents 195b2497 9bc62df4

drivers/char/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ config MSM_RDBG 
	  for a debugger running on a host PC to communicate with a remote

	  stub running on peripheral subsystems such as the ADSP, MODEM etc.



config QCOM_SDIO_CLIENT

	bool "QCOM_SDIO_CLIENT support"

config QTI_SDIO_CLIENT

	bool "QTI_SDIO_CLIENT support"

	depends on SDIO_QCN

	default y

	help

drivers/char/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,4 +67,4 @@ ifdef CONFIG_COMPAT 
obj-$(CONFIG_MSM_ADSPRPC)       += adsprpc_compat.o

endif

obj-$(CONFIG_MSM_RDBG)		+= rdbg.o

obj-$(CONFIG_QCOM_SDIO_CLIENT)	+= qti_sdio_client.o
 
obj-$(CONFIG_QTI_SDIO_CLIENT)	+= qti_sdio_client.o

drivers/char/diag/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endmenu 
menu "HSIC/SMUX support for DIAG"



config DIAGFWD_BRIDGE_CODE

	depends on USB_QCOM_DIAG_BRIDGE || MSM_MHI || QCOM_SDIO_CLIENT

	depends on USB_QCOM_DIAG_BRIDGE || MSM_MHI || QTI_SDIO_CLIENT

	default y

	bool "Enable QSC/9K DIAG traffic over SMUX/HSIC"

	help

drivers/char/diag/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ obj-$(CONFIG_DIAGFWD_BRIDGE_CODE) += diagfwd_bridge.o 


obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_hsic.o

obj-$(CONFIG_MSM_MHI) += diagfwd_mhi.o

obj-$(CONFIG_QCOM_SDIO_CLIENT) += diagfwd_sdio.o

obj-$(CONFIG_QTI_SDIO_CLIENT) += diagfwd_sdio.o



diagchar-objs := diagchar_core.o diagchar_hdlc.o diagfwd.o diagfwd_glink.o diagfwd_peripheral.o diagfwd_smd.o diagfwd_socket.o diag_mux.o diag_memorydevice.o diag_usb.o diagmem.o diagfwd_cntl.o diag_dci.o diag_masks.o diag_debugfs.o

drivers/char/diag/diagfwd_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int diag_mhi_init(void) 
}

#endif



#ifndef CONFIG_QCOM_SDIO_CLIENT

#ifndef CONFIG_QTI_SDIO_CLIENT

static int diag_sdio_init(void)

{

	return -EINVAL;