Commit d8b0e2ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v7.1-rc1' of... 

Merge tag 'regulator-fix-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "A fix from Arnd re-adding a dependency on gpiolib which was implicitly
  pulled in via an OF specific route which got removed as part of a
  cleanup"

* tag 'regulator-fix-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: rpi-panel-attiny: add back GPIOLIB dependency
parents a973736a 7dfc0063

drivers/regulator/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,7 @@ config REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY 
	tristate "Raspberry Pi 7-inch touchscreen panel ATTINY regulator"

	depends on ARM || ARM64 || COMPILE_TEST

	depends on BACKLIGHT_CLASS_DEVICE

	depends on GPIOLIB

	depends on I2C

	select REGMAP_I2C

	help