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

[firefly-linux-kernel-4.4.55.git] / drivers / mailbox / Kconfig

diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index bbec5009cdc2b8bd7d82612a17c07805d845575b..546d05f4358a7c452ee80366b3ae782e685fd7ef 100644 (file)
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -71,4 +71,18 @@ config BCM2835_MBOX
          the services of the Videocore. Say Y here if you want to use the
          BCM2835 Mailbox.
 
+config STI_MBOX
+       tristate "STI Mailbox framework support"
+       depends on ARCH_STI && OF
+       help
+         Mailbox implementation for STMicroelectonics family chips with
+         hardware for interprocessor communication.
+
+config MAILBOX_TEST
+       tristate "Mailbox Test Client"
+       depends on OF
+       help
+         Test client to help with testing new Controller driver
+         implementations.
+
 endif