Merge "gpu: ion: Remove mach/ion.h" (01f42e81) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/board-8226.c

+0 −3

+0 −3

Original line number	Diff line number	Diff line
		@@ -31,9 +31,6 @@
		#include <mach/gpiomux.h>
		#include <mach/msm_iomap.h>
		#include <mach/restart.h>
		#ifdef CONFIG_ION_MSM
		#include <mach/ion.h>
		#endif
		#include <linux/regulator/qpnp-regulator.h>
		#include <mach/msm_memtypes.h>
		#include <mach/socinfo.h>

+0 −3

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		/**
		*
		* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#ifndef __MACH_ION_H_
		#define __MACH_ION_H_

		enum ion_memory_types {
		ION_EBI_TYPE,
		ION_SMI_TYPE,
		};

		enum ion_permission_type {
		IPT_TYPE_MM_CARVEOUT = 0,
		IPT_TYPE_MFC_SHAREDMEM = 1,
		IPT_TYPE_MDP_WRITEBACK = 2,
		};

		#endif

+0 −1