Fix building with ION support

Conflicts:
	include/linux/ion.h