diff --git a/[refs] b/[refs]
index 04796d6a938c..fd15f13b0c70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c5bb2e42e6f12c02e6c8db9883ffa7602c68c19
+refs/heads/master: 60fe5771be6aa3f37d5887aa01c04f733130a559
diff --git a/trunk/include/linux/mmc/Kbuild b/trunk/include/linux/mmc/Kbuild
index 1fb26448faa9..e69de29bb2d1 100644
--- a/trunk/include/linux/mmc/Kbuild
+++ b/trunk/include/linux/mmc/Kbuild
@@ -1 +0,0 @@
-header-y += ioctl.h
diff --git a/trunk/include/uapi/linux/mmc/Kbuild b/trunk/include/uapi/linux/mmc/Kbuild
index aafaa5aa54d4..8c1d2cb75e33 100644
--- a/trunk/include/uapi/linux/mmc/Kbuild
+++ b/trunk/include/uapi/linux/mmc/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += ioctl.h
diff --git a/trunk/include/linux/mmc/ioctl.h b/trunk/include/uapi/linux/mmc/ioctl.h
similarity index 100%
rename from trunk/include/linux/mmc/ioctl.h
rename to trunk/include/uapi/linux/mmc/ioctl.h