am bf3da78e: am 85811fc7: Revert "msm_ion: switch to using legacy_ion.h"

* commit 'bf3da78e690524414a8874313638f7cf33b44424':
  Revert "msm_ion: switch to using legacy_ion.h"
This commit is contained in:
Ajay Dudani 2012-09-05 21:47:56 -07:00 committed by Android Git Automerger
commit 1c24c54840

View File

@ -18,7 +18,7 @@
****************************************************************************/ ****************************************************************************/
#ifndef __LINUX_MSM_ION_H__ #ifndef __LINUX_MSM_ION_H__
#define __LINUX_MSM_ION_H__ #define __LINUX_MSM_ION_H__
#include <linux/legacy_ion.h> #include <linux/ion.h>
enum msm_ion_heap_types { enum msm_ion_heap_types {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
ION_HEAP_TYPE_IOMMU = ION_HEAP_TYPE_CUSTOM + 1, ION_HEAP_TYPE_IOMMU = ION_HEAP_TYPE_CUSTOM + 1,