Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[cris-mirror.git] / drivers / staging / android / Makefile

ccflags-y += -I$(src)                   # needed for trace events

obj-y                                   += ion/

obj-$(CONFIG_ASHMEM)                    += ashmem.o