From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 May 2013 21:04:56 +0000 (-0700)
Subject: Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad... 
X-Git-Tag: v3.10-rc1~57
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=de9c9f86be0dc3495de98dc65c80abe6e7c7d643;p=linux.git

Merge tag 'remoteproc-3.10' of git://git./linux/kernel/git/ohad/remoteproc

Pull remoteproc update from Ohad Ben-Cohen:

 - Some refactoring, cleanups and small improvements from Sjur
   Brændeland.  The improvements are mainly about better supporting
   varios virtio properties (such as virtio's config space, status and
   features).  I now see that I messed up while commiting one of Sjur's
   patches and erroneously put myself as the author, as well as letting
   a nasty typo sneak in.  I will not fix this in order to avoid
   rebasing the patches.  Sjur - sorry!

 - A new remoteproc driver for OMAP-L13x (technically a DaVinci
   platform) from Robert Tivy.

 - Extend OMAP support to OMAP5 as well, from Vincent Stehlé.

 - Fix Kconfig VIRTUALIZATION dependency, from Suman Anna (a
   non-critical fix which arrived late during the rc cycle).

* tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: fix kconfig dependencies for VIRTIO
  remoteproc/davinci: add a remoteproc driver for OMAP-L13x DSP
  remoteproc: support default firmware name in rproc_alloc()
  remoteproc/omap: support OMAP5 too
  remoteproc: set vring addresses in resource table
  remoteproc: support virtio config space.
  remoteproc: perserve resource table data
  remoteproc: calculate max_notifyid by counting vrings
  remoteproc: code cleanup of resource parsing
  remoteproc: parse STE-firmware and find resource table address
  remoteproc: add find_loaded_rsc_table firmware ops
  remoteproc: refactor rproc_elf_find_rsc_table()
---

de9c9f86be0dc3495de98dc65c80abe6e7c7d643
diff --cc drivers/remoteproc/Kconfig
index c6d77e20622c,1ceb4867c97a..d4d377c40ec9
--- a/drivers/remoteproc/Kconfig
+++ b/drivers/remoteproc/Kconfig
@@@ -4,8 -4,10 +4,10 @@@ menu "Remoteproc drivers
  config REMOTEPROC
  	tristate
  	depends on HAS_DMA
+ 	select CRC32
 -	select FW_CONFIG
 +	select FW_LOADER
  	select VIRTIO
+ 	select VIRTUALIZATION
  
  config OMAP_REMOTEPROC
  	tristate "OMAP remoteproc support"