Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 95ccedabba4f9dca37dbd4909e3bc578ec619cd3..ab8dfbef6f1bb681a9ff14ca1e7ca09749b6a199 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -29,7 +29,7 @@ menuconfig SPI
 if SPI
 
 config SPI_DEBUG
-       boolean "Debug support for SPI drivers"
+       bool "Debug support for SPI drivers"
        depends on DEBUG_KERNEL
        help
          Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
@@ -40,8 +40,8 @@ config SPI_DEBUG
 #
 
 config SPI_MASTER
-#      boolean "SPI Master Support"
-       boolean
+#      bool "SPI Master Support"
+       bool
        default SPI
        help
          If your system has an master-capable SPI controller (which