Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 3354ad766a4914361c3fa51e2cc0c1b4cee1cd7f..f821dbc952a42bb2e53a49c110decc859eff3d55 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -4,6 +4,18 @@ config OF_DEVICE
 
 config OF_GPIO
        def_bool y
-       depends on OF && PPC_OF && HAVE_GPIO_LIB
+       depends on OF && PPC_OF && GPIOLIB
        help
          OpenFirmware GPIO accessors
+
+config OF_I2C
+       def_tristate I2C
+       depends on PPC_OF && I2C
+       help
+         OpenFirmware I2C accessors
+
+config OF_SPI
+       def_tristate SPI
+       depends on OF && PPC_OF && SPI
+       help
+         OpenFirmware SPI accessors