From 452d487a7965cb1d4a388796319478be846bbffc Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 15 Apr 2011 20:04:45 +0800 Subject: [PATCH] --- yaml --- r: 251929 b: refs/heads/master c: 37df003c85efd40b20c6d54695d4f03e6e75ebe6 h: refs/heads/master i: 251927: 7d419ffa8425fd1a53fe5f73b48607059aab6a81 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/Kconfig | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index c5b07b6333f9..59705ed53b36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca972d13382436530896e90591e2793e7a9e7eba +refs/heads/master: 37df003c85efd40b20c6d54695d4f03e6e75ebe6 diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig index 481770ab2716..66db02cee2ad 100644 --- a/trunk/drivers/mfd/Kconfig +++ b/trunk/drivers/mfd/Kconfig @@ -157,6 +157,20 @@ config TPS6507X This driver can also be built as a module. If so, the module will be called tps6507x. +config MFD_TPS6586X + bool "TPS6586x Power Management chips" + depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS + select MFD_CORE + help + If you say yes here you get support for the TPS6586X series of + Power Management chips. + This driver provides common support for accessing the device, + additional drivers must be enabled in order to use the + functionality of the device. + + This driver can also be built as a module. If so, the module + will be called tps6586x. + config MENELAUS bool "Texas Instruments TWL92330/Menelaus PM chip" depends on I2C=y && ARCH_OMAP2 @@ -649,20 +663,6 @@ config MFD_JZ4740_ADC Say yes here if you want support for the ADC unit in the JZ4740 SoC. This driver is necessary for jz4740-battery and jz4740-hwmon driver. -config MFD_TPS6586X - bool "TPS6586x Power Management chips" - depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS - select MFD_CORE - help - If you say yes here you get support for the TPS6586X series of - Power Management chips. - This driver provides common support for accessing the device, - additional drivers must be enabled in order to use the - functionality of the device. - - This driver can also be built as a module. If so, the module - will be called tps6586x. - config MFD_VX855 tristate "Support for VIA VX855/VX875 integrated south bridge" depends on PCI