diff --git a/[refs] b/[refs] index 729a78538ea6..c00110d9bff2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af8b5fc31099abd7f3b297332c9e280ec0b30a71 +refs/heads/master: 809d310c7e69289c94a4475d287ba1c512885478 diff --git a/trunk/drivers/regulator/Kconfig b/trunk/drivers/regulator/Kconfig index 870f7300b156..434462ada7c0 100644 --- a/trunk/drivers/regulator/Kconfig +++ b/trunk/drivers/regulator/Kconfig @@ -20,6 +20,7 @@ menuconfig REGULATOR If unsure, say no. + if REGULATOR config REGULATOR_DEBUG @@ -225,7 +226,7 @@ config REGULATOR_LP3972 on National Semiconductors LP3972 PMIC config REGULATOR_LP872X - tristate "TI/National Semiconductor LP8720/LP8725 voltage regulators" + bool "TI/National Semiconductor LP8720/LP8725 voltage regulators" depends on I2C select REGMAP_I2C help