aboutsummaryrefslogtreecommitdiff
path: root/drivers/remoteproc/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 15:21:12 -0800
committerOlof Johansson <olof@lixom.net>2012-03-07 15:21:12 -0800
commit6458acb5a31926dcc1295410221493544d628cf7 (patch)
tree15b5a855f73d52f95aeed2ab11e2e8028d82b746 /drivers/remoteproc/Makefile
parentab646a24bb9b6125f3c23ef908b7c5b44b1b4e69 (diff)
parent1e3e2c7c46b2e6e90f3a26ba9be6326c00ca31e4 (diff)
Merge tag 'rpmsg-fixes-and-more-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc into next/rpmsg
Fixing and cleaning up several remoteproc and rpmsg issues. In addition, remoteproc's resource table is converted to a collection of type-value members, instead of a rigid array of homogeneous structs. This enables remoteproc to support registration of generic virtio devices, and not only a single VIRTIO_ID_RPMSG virtio device. But perhaps more importantly, the resource table overhaul makes it possible to easily extend it in the future without breaking older images (simply by defining a new member type, while continuing to support older types). * tag 'rpmsg-fixes-and-more-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc: remoteproc: cleanup resource table parsing paths remoteproc: remove the hardcoded vring alignment remoteproc/omap: remove the mbox_callback limitation remoteproc: remove the single rpmsg vdev limitation remoteproc: safer boot/shutdown order remoteproc: remoteproc_rpmsg -> remoteproc_virtio remoteproc: resource table overhaul rpmsg: fix build warning when dma_addr_t is 64-bit rpmsg: fix published buffer length in rpmsg_recv_done rpmsg: validate incoming message length before propagating rpmsg: fix name service endpoint leak remoteproc/omap: two Kconfig fixes remoteproc: make sure we're parsing a 32bit firmware
Diffstat (limited to 'drivers/remoteproc/Makefile')
-rw-r--r--drivers/remoteproc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
index df0897f69e1..5445d9b2329 100644
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@ -5,5 +5,5 @@
obj-$(CONFIG_REMOTEPROC) += remoteproc.o
remoteproc-y := remoteproc_core.o
remoteproc-y += remoteproc_debugfs.o
-remoteproc-y += remoteproc_rpmsg.o
+remoteproc-y += remoteproc_virtio.o
obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o