aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-09 13:23:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-09 13:23:21 -0700
commit84836bf9739f93ca43d7b2b6bdda1ea1b8e3e0a4 (patch)
tree06be387fcdbbd6f48de28ad1e3025bd0a773a1f4 /drivers
parentMerge tag 'hwspinlock-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock (diff)
parentremoteproc: fix missing CONFIG_FW_LOADER configurations (diff)
downloadlinux-dev-84836bf9739f93ca43d7b2b6bdda1ea1b8e3e0a4.tar.xz
linux-dev-84836bf9739f93ca43d7b2b6bdda1ea1b8e3e0a4.zip
Merge tag 'remoteproc-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
Pull remoteproc fixes from Ohad Ben-Cohen: "Two build-related remoteproc fixes for 3.5." * tag 'remoteproc-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc: remoteproc: fix missing CONFIG_FW_LOADER configurations remoteproc/omap: fix randconfig unmet direct dependencies
Diffstat (limited to 'drivers')
-rw-r--r--drivers/remoteproc/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
index 24d880e78ec6..f8d818abf98c 100644
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@ -4,9 +4,11 @@ menu "Remoteproc drivers (EXPERIMENTAL)"
config REMOTEPROC
tristate
depends on EXPERIMENTAL
+ select FW_CONFIG
config OMAP_REMOTEPROC
tristate "OMAP remoteproc support"
+ depends on EXPERIMENTAL
depends on ARCH_OMAP4
depends on OMAP_IOMMU
select REMOTEPROC