aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/Kconfig
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-12-09 10:37:47 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-09 10:37:47 +0000
commit9fe2a07ba46d39cbf13f01b17ed6fa0845d7d354 (patch)
tree3077554dd7bd6e68e2ea497768b433a5468b372e /drivers/power/Kconfig
parente913d81603e905670a65dfb44744656a678fba31 (diff)
downloadmrst-s0i3-test-9fe2a07ba46d39cbf13f01b17ed6fa0845d7d354.tar.gz
mrst-s0i3-test-9fe2a07ba46d39cbf13f01b17ed6fa0845d7d354.tar.xz
mrst-s0i3-test-9fe2a07ba46d39cbf13f01b17ed6fa0845d7d354.zip
intel_mid: Medfield battery driver tidy up
- Fix kfifo build problem - Clean up printing to debug level for the most part - Remove an impossible NULL check - Clean up all the ipc writing loops using a single helper Signed-off-by: Alan Cox <alan@linux.intel.com>
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r--drivers/power/Kconfig24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index b6e41e6cb87..6d90108e12a 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -165,12 +165,19 @@ config BATTERY_JZ4740
This driver can be build as a module. If so, the module will be
called jz4740-battery.
-config BATTERY_INTEL_MID
- tristate "Battery driver for Intel MID platforms"
- depends on INTEL_SCU_IPC && SPI
+config BATTERY_INTEL_MID_MRST
+ tristate "Battery driver for Intel Moorestown MID platforms"
+ depends on INTEL_SCU_IPC && SPI && USB_GADGET_LANGWELL
help
- Say Y here to enable the battery driver on Intel MID
- platforms.
+ Say Y here to enable the battery driver on Intel Moorestown
+ based MID platforms.
+
+config BATTERY_INTEL_MID_MFLD
+ tristate "Battery driver for Intel Medfield MID platforms"
+ depends on INTEL_SCU_IPC && USB_PENWELL_OTG
+ help
+ Say Y here to enable the battery driver on Intel Medfield
+ based MID platforms.
config CHARGER_ISP1704
tristate "ISP1704 USB Charger Detection"
@@ -185,11 +192,4 @@ config CHARGER_TWL4030
help
Say Y here to enable support for TWL4030 Battery Charge Interface.
-config BATTERY_INTEL_MDF
- tristate "Battery driver for Intel MDFLD platforms"
- depends on INTEL_SCU_IPC && USB_PENWELL_OTG
- help
- Say Y here to enable the battery driver on Intel MFLD
- platforms.
-
endif # POWER_SUPPLY