diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 20:17:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 20:17:30 +0200 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /drivers/remoteproc/Kconfig | |
| parent | net-tcp: Fast Open client - cookie-less mode (diff) | |
| parent | Merge tag 'md-3.5-fixes' of git://neil.brown.name/md (diff) | |
| download | linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.tar.xz linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'drivers/remoteproc/Kconfig')
| -rw-r--r-- | drivers/remoteproc/Kconfig | 2 |
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 |