diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 03:21:35 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 03:21:35 +0200 |
commit | 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17 (patch) | |
tree | e3d511aca536b7123d256b98a0ef8e74fc219498 /drivers/remoteproc/Kconfig | |
parent | misc: tsl2550: Use dev_pm_ops (diff) | |
parent | Linux 3.9-rc7 (diff) | |
download | linux-2f093e2aa466d799c0952bfd1c6c68ff5d80fc17.tar.xz linux-2f093e2aa466d799c0952bfd1c6c68ff5d80fc17.zip |
Merge 3.9-rc7 into char-misc-next
We want the fixes in there.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/remoteproc/Kconfig')
-rw-r--r-- | drivers/remoteproc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index cc1f7bf53fd0..c6d77e20622c 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -4,7 +4,7 @@ menu "Remoteproc drivers" config REMOTEPROC tristate depends on HAS_DMA - select FW_CONFIG + select FW_LOADER select VIRTIO config OMAP_REMOTEPROC |