Merge with mainline to remove plat-omap/Kconfig conflict

[net-next-2.6.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 413576a2f313347c745f85ded7e3820a1ad55813..b670d10d5c92f8d751a39abe6472f8827080df55 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -94,7 +94,7 @@ config TPS65010
 
 config MENELAUS
        bool "Texas Instruments TWL92330/Menelaus PM chip"
-       depends on I2C=y && ARCH_OMAP24XX
+       depends on I2C=y && ARCH_OMAP2
        help
          If you say yes here you get support for the Texas Instruments
          TWL92330/Menelaus Power Management chip. This include voltage