diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-03 00:39:07 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-03 00:39:07 (GMT) |
| commit | 06749f192b740651302a84273707d0b66749d126 (patch) | |
| tree | f79f6bd1f8a8a0b63b624d78bedc5c00650f1383 /drivers/staging/tidspbridge/Kconfig | |
| parent | 931cf48d2db64c67d0e917f55d7db7ab7b9fefa3 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
| download | linux-06749f192b740651302a84273707d0b66749d126.tar.xz | |
Merge v3.13-rc2 into staging-next
we want these fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/tidspbridge/Kconfig')
| -rw-r--r-- | drivers/staging/tidspbridge/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/tidspbridge/Kconfig b/drivers/staging/tidspbridge/Kconfig index 165b918..1b6d581 100644 --- a/drivers/staging/tidspbridge/Kconfig +++ b/drivers/staging/tidspbridge/Kconfig @@ -4,7 +4,7 @@ menuconfig TIDSPBRIDGE tristate "DSP Bridge driver" - depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM + depends on ARCH_OMAP3 && !ARCH_MULTIPLATFORM && BROKEN select MAILBOX select OMAP2PLUS_MBOX help |