Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 744ecbcc450cc6b690e22f19c35239fa90fd1f07..4c27f8ae7d8aca8ed6d374f6478b2aa2db108a24 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -1,4 +1,4 @@
-
+#
 # Miscellaneous I2C chip drivers configuration
 #
 # *** DEPRECATED! Do not add new entries! See Makefile ***
@@ -195,15 +195,4 @@ config MENELAUS
          and other features that are often used in portable devices like
          cell phones and PDAs.
 
-config MCU_MPC8349EMITX
-       tristate "MPC8349E-mITX MCU driver"
-       depends on I2C && PPC_83xx
-       select GENERIC_GPIO
-       select ARCH_REQUIRE_GPIOLIB
-       help
-         Say Y here to enable soft power-off functionality on the Freescale
-         boards with the MPC8349E-mITX-compatible MCU chips. This driver will
-         also register MCU GPIOs with the generic GPIO API, so you'll able
-         to use MCU pins as GPIOs.
-
 endmenu