diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index a2efb62aa776..d8a22c2a579d 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,2 +1,2 @@
-obj-y			+= drm/ vga/ ion/
+obj-y			+= drm/ vga/
 obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index fe11eb6fa966..6da535db2538 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -108,6 +108,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
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index c136299e05af..0a01e1914905 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -1,5 +1,7 @@
 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
diff --git a/drivers/gpu/ion/Kconfig b/drivers/staging/android/ion/Kconfig
similarity index 100%
rename from drivers/gpu/ion/Kconfig
rename to drivers/staging/android/ion/Kconfig
diff --git a/drivers/gpu/ion/Makefile b/drivers/staging/android/ion/Makefile
similarity index 100%
rename from drivers/gpu/ion/Makefile
rename to drivers/staging/android/ion/Makefile
diff --git a/drivers/gpu/ion/compat_ion.c b/drivers/staging/android/ion/compat_ion.c
similarity index 97%
rename from drivers/gpu/ion/compat_ion.c
rename to drivers/staging/android/ion/compat_ion.c
index e0d2839952a0..0416fabfc1b9 100644
--- a/drivers/gpu/ion/compat_ion.c
+++ b/drivers/staging/android/ion/compat_ion.c
@@ -14,14 +14,14 @@
  *
  */
 
-#include <linux/ion.h>
 #include <linux/compat.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 
+#include "ion.h"
 #include "compat_ion.h"
 
-/* See include/linux/ion.h for the definition of these structs */
+/* See drivers/staging/android/uapi/ion.h for the definition of these structs */
 struct compat_ion_allocation_data {
 	compat_size_t len;
 	compat_size_t align;
diff --git a/drivers/gpu/ion/compat_ion.h b/drivers/staging/android/ion/compat_ion.h
similarity index 100%
rename from drivers/gpu/ion/compat_ion.h
rename to drivers/staging/android/ion/compat_ion.h
diff --git a/drivers/gpu/ion/ion.c b/drivers/staging/android/ion/ion.c
similarity index 99%
rename from drivers/gpu/ion/ion.c
rename to drivers/staging/android/ion/ion.c
index e4ffc9d5b94b..5c886fc9cd7e 100644
--- a/drivers/gpu/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -20,7 +20,6 @@
 #include <linux/freezer.h>
 #include <linux/fs.h>
 #include <linux/anon_inodes.h>
-#include <linux/ion.h>
 #include <linux/kthread.h>
 #include <linux/list.h>
 #include <linux/memblock.h>
@@ -37,6 +36,7 @@
 #include <linux/dma-buf.h>
 #include <linux/idr.h>
 
+#include "ion.h"
 #include "ion_priv.h"
 #include "compat_ion.h"
 
diff --git a/include/linux/ion.h b/drivers/staging/android/ion/ion.h
similarity index 99%
rename from include/linux/ion.h
rename to drivers/staging/android/ion/ion.h
index 5771f8c3d3ac..6b4d9fbeaec4 100644
--- a/include/linux/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -1,5 +1,5 @@
 /*
- * include/linux/ion.h
+ * drivers/staging/android/ion/ion.h
  *
  * Copyright (C) 2011 Google, Inc.
  *
diff --git a/drivers/gpu/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
similarity index 99%
rename from drivers/gpu/ion/ion_carveout_heap.c
rename to drivers/staging/android/ion/ion_carveout_heap.c
index 86f35545eaf7..4a94b17da67e 100644
--- a/drivers/gpu/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -18,11 +18,11 @@
 #include <linux/err.h>
 #include <linux/genalloc.h>
 #include <linux/io.h>
-#include <linux/ion.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 #include <asm/mach/map.h>
diff --git a/drivers/gpu/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
similarity index 99%
rename from drivers/gpu/ion/ion_chunk_heap.c
rename to drivers/staging/android/ion/ion_chunk_heap.c
index 15c9d7ad2502..a2b2e1b7af38 100644
--- a/drivers/gpu/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -18,11 +18,11 @@
 #include <linux/err.h>
 #include <linux/genalloc.h>
 #include <linux/io.h>
-#include <linux/ion.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 #include <asm/mach/map.h>
diff --git a/drivers/gpu/ion/ion_cma_heap.c b/drivers/staging/android/ion/ion_cma_heap.c
similarity index 98%
rename from drivers/gpu/ion/ion_cma_heap.c
rename to drivers/staging/android/ion/ion_cma_heap.c
index 1eaa8c11e04c..55d6003f546c 100644
--- a/drivers/gpu/ion/ion_cma_heap.c
+++ b/drivers/staging/android/ion/ion_cma_heap.c
@@ -16,13 +16,12 @@
  */
 
 #include <linux/device.h>
-#include <linux/ion.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/dma-mapping.h>
 
-/* for ion_heap_ops structure */
+#include "ion.h"
 #include "ion_priv.h"
 
 #define ION_CMA_ALLOCATE_FAILED -1
diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
similarity index 99%
rename from drivers/gpu/ion/ion_heap.c
rename to drivers/staging/android/ion/ion_heap.c
index 786302de7ed0..9be246f50a01 100644
--- a/drivers/gpu/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -16,13 +16,13 @@
 
 #include <linux/err.h>
 #include <linux/freezer.h>
-#include <linux/ion.h>
 #include <linux/kthread.h>
 #include <linux/mm.h>
 #include <linux/rtmutex.h>
 #include <linux/sched.h>
 #include <linux/scatterlist.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 void *ion_heap_map_kernel(struct ion_heap *heap,
diff --git a/drivers/gpu/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c
similarity index 100%
rename from drivers/gpu/ion/ion_page_pool.c
rename to drivers/staging/android/ion/ion_page_pool.c
diff --git a/drivers/gpu/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h
similarity index 99%
rename from drivers/gpu/ion/ion_priv.h
rename to drivers/staging/android/ion/ion_priv.h
index 32461e946735..0ccf409cde7d 100644
--- a/drivers/gpu/ion/ion_priv.h
+++ b/drivers/staging/android/ion/ion_priv.h
@@ -17,7 +17,6 @@
 #ifndef _ION_PRIV_H
 #define _ION_PRIV_H
 
-#include <linux/ion.h>
 #include <linux/kref.h>
 #include <linux/mm_types.h>
 #include <linux/mutex.h>
@@ -26,6 +25,8 @@
 #include <linux/shrinker.h>
 #include <linux/types.h>
 
+#include "ion.h"
+
 struct ion_buffer *ion_handle_buffer(struct ion_handle *handle);
 
 /**
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
similarity index 99%
rename from drivers/gpu/ion/ion_system_heap.c
rename to drivers/staging/android/ion/ion_system_heap.c
index 5fe81a76f2f5..06e0702396a4 100644
--- a/drivers/gpu/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -18,12 +18,12 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/highmem.h>
-#include <linux/ion.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 static unsigned int high_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |
diff --git a/drivers/gpu/ion/tegra/Makefile b/drivers/staging/android/ion/tegra/Makefile
similarity index 100%
rename from drivers/gpu/ion/tegra/Makefile
rename to drivers/staging/android/ion/tegra/Makefile
diff --git a/drivers/gpu/ion/tegra/tegra_ion.c b/drivers/staging/android/ion/tegra/tegra_ion.c
similarity index 98%
rename from drivers/gpu/ion/tegra/tegra_ion.c
rename to drivers/staging/android/ion/tegra/tegra_ion.c
index 7af6e168ff4c..0849600bcc00 100644
--- a/drivers/gpu/ion/tegra/tegra_ion.c
+++ b/drivers/staging/android/ion/tegra/tegra_ion.c
@@ -15,9 +15,9 @@
  */
 
 #include <linux/err.h>
-#include <linux/ion.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include "../ion.h"
 #include "../ion_priv.h"
 
 struct ion_device *idev;
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7c5e27e52b9f..0669dac2301d 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -23,8 +23,6 @@ source "drivers/gpu/drm/Kconfig"
 
 source "drivers/gpu/host1x/Kconfig"
 
-source "drivers/gpu/ion/Kconfig"
-
 config VGASTATE
        tristate
        default n