From 7e1c100d77610f94bfa0a6d4aa8caee16029571c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 21 Feb 2012 10:14:55 +0800 Subject: [PATCH] --- yaml --- r: 292031 b: refs/heads/master c: ae0e6544347d6e114b6fa7eea66ebd062e4d8858 h: refs/heads/master i: 292029: f34e5e639621325a537c632cf1c1444c0c9b1d6a 292027: 9c717929d760c09b7e63151e0fb9f7fb8b642d8e 292023: 1e18def66e20e81be39b6535a23a21be9a669e9d 292015: 11d5323c11a7ecf4bcd9e05181fbcf8ca7c0df83 291999: 491d8145c4fac15294202ba51e7f7be2cdf224f9 291967: 09e31aa53eb0269908ddd86d75c7d85a00824eef v: v3 --- [refs] | 2 +- trunk/drivers/regulator/Kconfig | 4 ++-- trunk/drivers/regulator/tps65910-regulator.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 703b3ba705c1..59e310144d41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e882eae80f37fac922c6faa25e5ba535f29f2d38 +refs/heads/master: ae0e6544347d6e114b6fa7eea66ebd062e4d8858 diff --git a/trunk/drivers/regulator/Kconfig b/trunk/drivers/regulator/Kconfig index 376824b865a4..edcd9e259368 100644 --- a/trunk/drivers/regulator/Kconfig +++ b/trunk/drivers/regulator/Kconfig @@ -344,10 +344,10 @@ config REGULATOR_TPS6524X port controller. config REGULATOR_TPS65910 - tristate "TI TPS65910 Power Regulator" + tristate "TI TPS65910/TPS65911 Power Regulators" depends on MFD_TPS65910 help - This driver supports TPS65910 voltage regulator chips. + This driver supports TPS65910/TPS65911 voltage regulator chips. config REGULATOR_TPS62360 tristate "TI TPS62360 Power Regulator" diff --git a/trunk/drivers/regulator/tps65910-regulator.c b/trunk/drivers/regulator/tps65910-regulator.c index a9bb6d45ceff..15b5f1ec17b7 100644 --- a/trunk/drivers/regulator/tps65910-regulator.c +++ b/trunk/drivers/regulator/tps65910-regulator.c @@ -1235,6 +1235,6 @@ static void __exit tps65910_cleanup(void) module_exit(tps65910_cleanup); MODULE_AUTHOR("Graeme Gregory "); -MODULE_DESCRIPTION("TPS6507x voltage regulator driver"); +MODULE_DESCRIPTION("TPS65910/TPS65911 voltage regulator driver"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:tps65910-pmic");