Commit 2ed89d57 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next

parents 2dfcb921 3b063496

drivers/regulator/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -828,7 +828,7 @@ config REGULATOR_TPS65912 
	    This driver supports TPS65912 voltage regulator chip.

	    This driver supports TPS65912 voltage regulator chip.





config REGULATOR_TPS80031

config REGULATOR_TPS80031

	tristate "TI TPS80031/TPS80032 power regualtor driver"

	tristate "TI TPS80031/TPS80032 power regulator driver"

	depends on MFD_TPS80031

	depends on MFD_TPS80031

	help

	help

	  TPS80031/ TPS80032 Fully Integrated Power Management with Power

	  TPS80031/ TPS80032 Fully Integrated Power Management with Power