diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 60cb3632c8fd80222b0c587e82aa44f46638e93f..fee678f74a191909723ef669187528015f313780 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -96,7 +96,8 @@ config GPIO_VR41XX
 
 config GPIO_SCH
 	tristate "Intel SCH GPIO"
-	depends on GPIOLIB
+	depends on GPIOLIB && PCI
+	select MFD_CORE
 	select LPC_SCH
 	help
 	  Say yes here to support GPIO interface on Intel Poulsbo SCH.
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index f22eff1da87e3bfe6421c8f98ddb2e1dd636ae0e..4cd1ff77cedaea4bb3d292270c4e883b1746de12 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -105,6 +105,8 @@ config I2C_I801
 
 config I2C_ISCH
 	tristate "Intel SCH SMBus 1.0"
+	depends on PCI
+	select MFD_CORE
 	select LPC_SCH
 	help
 	  Say Y here if you want to use SMBus controller on the Intel SCH