diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index bda20bf1594..b04468dfc73 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -28,7 +28,7 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 #include <linux/shmem_fs.h>
-#include "ashmem.h"
+#include <linux/ashmem.h>
 
 #define ASHMEM_NAME_PREFIX "dev/ashmem/"
 #define ASHMEM_NAME_PREFIX_LEN (sizeof(ASHMEM_NAME_PREFIX) - 1)
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index c5a9cae514c..10f82d832e9 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -46,6 +46,7 @@ header-y += agpgart.h
 header-y += aio_abi.h
 header-y += apm_bios.h
 header-y += arcfb.h
+header-y += ashmem.h
 header-y += atalk.h
 header-y += atm.h
 header-y += atm_eni.h
diff --git a/drivers/staging/android/ashmem.h b/include/linux/ashmem.h
similarity index 100%
rename from drivers/staging/android/ashmem.h
rename to include/linux/ashmem.h