Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Mark twl4030_charger as broken
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 60d83d9..ec44477 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -182,6 +182,7 @@
 config CHARGER_TWL4030
 	tristate "OMAP TWL4030 BCI charger driver"
 	depends on TWL4030_CORE
+	depends on BROKEN
 	help
 	  Say Y here to enable support for TWL4030 Battery Charge Interface.