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

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

Merge "drivers: soc: Fix device naming"

parents 2d62faaa c7990c05

drivers/soc/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ config MSM_CORE_HANG_DETECT 
	  enabled or disabled dynamically.



config QCOM_WATCHDOG_V2

	bool "Qualcomm Watchdog Support"

	bool "QTI Watchdog Support"

	depends on ARCH_QCOM

	help

	  This enables the watchdog module. It causes kernel panic if the

drivers/soc/qcom/socinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ msm_get_vendor(struct device *dev, 
		struct device_attribute *attr,

		char *buf)

{

	return snprintf(buf, PAGE_SIZE, "Qualcomm\n");

	return snprintf(buf, PAGE_SIZE, "Qualcomm Technologies, Inc\n");

}



static ssize_t