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

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

Merge "drivers: char: Fix compilation error for smd pkt driver"

parents c14f9cb7 eeacfb1e

arch/arm/configs/vendor/msm8937_32go-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -340,6 +340,7 @@ CONFIG_INPUT_UINPUT=y 
CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_HS=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_MSM_SMD_PKT=y

CONFIG_DIAG_CHAR=y

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_MSM_RDBG=m

arch/arm/configs/vendor/msm8937_32go_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -347,6 +347,7 @@ CONFIG_SERIAL_MSM_CONSOLE=y 
CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_HS=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_MSM_SMD_PKT=y

CONFIG_DIAG_CHAR=y

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_MSM_RDBG=m

drivers/char/msm_smd_pkt.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -155,8 +155,7 @@ static ssize_t open_timeout_show(struct device *dev, 
	return ret;

	return ret;

}

}





static DEVICE_ATTR_RW(open_timeout, 0644, open_timeout_show,

static DEVICE_ATTR(open_timeout, 0664, open_timeout_show, open_timeout_store);

					open_timeout_store);





static int smd_pkt_rpdev_probe(struct rpmsg_device *rpdev)

static int smd_pkt_rpdev_probe(struct rpmsg_device *rpdev)

{

{