diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 2d42a22..87797de 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -17,16 +17,17 @@
 	bool "LP3972 driver"
 
 config I2C_TWLCORE
-	depends on I2C
-	bool "TWL4030/TWL6030 driver"
-	select GPIO
+	bool
 
 config I2C_TWL4030
-	depends on I2C_TWLCORE
+	depends on I2C
+	depends on USB_TWL4030
+	select I2C_TWLCORE
 	bool "TWL4030 driver"
 
 config I2C_TWL6030
-	depends on I2C_TWLCORE
+	depends on I2C
+	select I2C_TWLCORE
 	bool "TWL6030 driver"
 
 config DRIVER_SPI_MC13783
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 96e09e2..439d8eb 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -3,6 +3,7 @@
 
 config USB_EHCI_OMAP
 	depends on ARCH_OMAP3
+	depends on USB_TWL4030
 	bool "OMAP EHCI driver"
 
 config USB_OHCI