Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 7c305317f372fb7edb5986a51b86ba5fd41d0667..f821dbc952a42bb2e53a49c110decc859eff3d55 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -4,12 +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_bool y
-       depends on 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