Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 809302d2ed5de1c9bbc19d81646b14b9b98fb5a7..74e890f22a1d7b5b66bc5563ac73741ccc9b85a4 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -5,11 +5,9 @@
 # nobody's needed a slave side API yet.  The master-role API is not
 # fully appropriate there, so it'd need some thought to do well.
 #
-menu "SPI support"
-       depends on HAS_IOMEM
-
-config SPI
+menuconfig SPI
        bool "SPI support"
+       depends on HAS_IOMEM
        help
          The "Serial Peripheral Interface" is a low level synchronous
          protocol.  Chips that support SPI can have data transfer rates
@@ -28,9 +26,11 @@ config SPI
          (half duplex), SSP, SSI, and PSP.  This driver framework should
          work with most such devices and controllers.
 
+if SPI
+
 config SPI_DEBUG
        boolean "Debug support for SPI drivers"
-       depends on SPI && DEBUG_KERNEL
+       depends on DEBUG_KERNEL
        help
          Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
          sysfs, and debugfs support in SPI controller and protocol drivers.
@@ -301,5 +301,4 @@ config SPI_TLE62X0
 
 # (slave support would go here)
 
-endmenu # "SPI support"
-
+endif # SPI