summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android/Makefile
diff options
context:
space:
mode:
authorGreg Hartman <ghartman@google.com>2018-04-12 22:17:22 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-23 14:51:37 +0200
commit3d2ec9dcd5539d421a6814ded10a1a3008e70548 (patch)
tree13a04a91565fea190b1ebaa8896a2e1f80282140 /drivers/staging/android/Makefile
parent7954c88408ca0c49689e75347739c2d5785bf5e0 (diff)
downloadlinux-3d2ec9dcd5539d421a6814ded10a1a3008e70548.tar.bz2
staging: Android: Add 'vsoc' driver for cuttlefish.
The cuttlefish system is a virtual SoC architecture based on QEMU. It uses the QEMU ivshmem feature to share memory regions between guest and host with a custom protocol. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Arve Hjønnevåg <arve@android.com> Cc: Todd Kjos <tkjos@android.com> Cc: Martijn Coenen <maco@android.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: devel@driverdev.osuosl.org Cc: kernel-team@android.com Signed-off-by: Greg Hartman <ghartman@google.com> [astrachan: rebased against 4.16, added TODO, fixed checkpatch issues] Signed-off-by: Alistair Strachan <astrachan@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/Makefile')
-rw-r--r--drivers/staging/android/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 7cf1564a49a5..90e6154f11a4 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -3,3 +3,4 @@ ccflags-y += -I$(src) # needed for trace events
obj-y += ion/
obj-$(CONFIG_ASHMEM) += ashmem.o
+obj-$(CONFIG_ANDROID_VSOC) += vsoc.o