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

Commit e7cd7886 authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next

parents 5454f211 a1cf1150 c21bec86 794b2e25

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -8056,8 +8056,8 @@ F: drivers/platform/x86/thinkpad_acpi.c 
TI BANDGAP AND THERMAL DRIVER

M:	Eduardo Valentin <eduardo.valentin@ti.com>

L:	linux-pm@vger.kernel.org

S:	Maintained

F:	drivers/staging/omap-thermal/

S:	Supported

F:	drivers/thermal/ti-soc-thermal/



TI FLASH MEDIA INTERFACE DRIVER

M:	Alex Dubov <oakad@yahoo.com>

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ source "drivers/staging/gdm72xx/Kconfig" 


source "drivers/staging/csr/Kconfig"



source "drivers/staging/ti-soc-thermal/Kconfig"



source "drivers/staging/silicom/Kconfig"



source "drivers/staging/ced1401/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_ANDROID) += android/ 
obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/

obj-$(CONFIG_WIMAX_GDM72XX)	+= gdm72xx/

obj-$(CONFIG_CSR_WIFI)		+= csr/

obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/

obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/

obj-$(CONFIG_CED1401)		+= ced1401/

obj-$(CONFIG_DRM_IMX)		+= imx-drm/

drivers/thermal/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -169,4 +169,7 @@ config INTEL_POWERCLAMP 
	  enforce idle time which results in more package C-state residency. The

	  user interface is exposed via generic thermal framework.



menu "Texas Instruments thermal drivers"

source "drivers/thermal/ti-soc-thermal/Kconfig"

endmenu

endif