summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-03-05 18:43:06 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2010-03-07 22:17:38 +0100
commit860fb8c134ebca9be8bc2ddd2b13e19ac10c192e (patch)
tree8ecebf46c290a39c80dda2812b8023242ed34349
parentgpio: Fix sch_gpio warning (diff)
downloadlinux-860fb8c134ebca9be8bc2ddd2b13e19ac10c192e.tar.xz
linux-860fb8c134ebca9be8bc2ddd2b13e19ac10c192e.zip
mfd: Fix lpc_sch related depends/selects, fix build error
LPC_SCH is selected by GPI_SCH and I2C_ISCH, even when PCI is not enabled, but LPC_SCH depends on PCI, so make GPI_SCH and I2C_ISCH also depend on PCI. Those 2 selects also need to select what LPC_SCH selects, since kconfig does not follow selects. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Denis Turischev <denis@compulab.co.il> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/gpio/Kconfig3
-rw-r--r--drivers/i2c/busses/Kconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 60cb3632c8fd..fee678f74a19 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 f22eff1da87e..4cd1ff77ceda 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