Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9741065b authored by Colin Cross's avatar Colin Cross Committed by Mitchel Humpherys
Browse files

ion: move into staging 



Move ion from drivers/gpu/ion to drivers/android/staging/ion.

Change-Id: Id6e996aa3954cbb8e1a8abc9578a56204f5eb211
Signed-off-by: default avatarColin Cross <ccross@android.com>
Git-commit: 8cb378f23cb15b6d7e5d57bde7bac8f157c9d301
Git-repo: http://android.googlesource.com/kernel/common/


[mitchelh@codeaurora.org: Some conflicts since we already did the UAPI split.]
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent 6b04e058

drivers/gpu/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y			+= drm/ vga/ ion/

obj-y			+= drm/ vga/

obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/

obj-$(CONFIG_MSM_KGSL)	+= msm/

drivers/staging/android/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ config SW_SYNC_USER 
	  *WARNING* improper use of this can result in deadlocking kernel

	  drivers from userspace.



source "drivers/staging/android/ion/Kconfig"



endif # if ANDROID



endmenu

drivers/staging/android/Makefile

+2 −0
Original line number Diff line number Diff line 
ccflags-y += -I$(src)			# needed for trace events



obj-y					+= ion/



obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o

obj-$(CONFIG_ASHMEM)			+= ashmem.o

obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o