diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:36:04 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 23:36:04 +0100 |
commit | 249f3c4fe4fdef159d3f9b3f7a6c41a92103c860 (patch) | |
tree | 58abfec8444741fd3bd403a908be50c4f63d4842 /drivers/mailbox/Kconfig | |
parent | xen/hvc: constify hv_ops structures (diff) | |
parent | Linux 4.5-rc4 (diff) | |
download | linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.tar.xz linux-249f3c4fe4fdef159d3f9b3f7a6c41a92103c860.zip |
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mailbox/Kconfig')
-rw-r--r-- | drivers/mailbox/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig index 546d05f4358a..b2bbe8659bed 100644 --- a/drivers/mailbox/Kconfig +++ b/drivers/mailbox/Kconfig @@ -81,6 +81,7 @@ config STI_MBOX config MAILBOX_TEST tristate "Mailbox Test Client" depends on OF + depends on HAS_IOMEM help Test client to help with testing new Controller driver implementations. |