diff --git a/[refs] b/[refs]
index 5f5448156d6d..fd4b2391c5dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956e944c7690ea994757a8cbedbb6241e1d9138f
+refs/heads/master: 9663265626fd683faa3f7a994bb6db073581807e
diff --git a/trunk/include/mtd/Kbuild b/trunk/include/mtd/Kbuild
index e1da2a5b2a57..f2f210fc1ef2 100644
--- a/trunk/include/mtd/Kbuild
+++ b/trunk/include/mtd/Kbuild
@@ -1,2 +1 @@
-unifdef-y := mtd-abi.h
-header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
+header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h
diff --git a/trunk/include/mtd/mtd-abi.h b/trunk/include/mtd/mtd-abi.h
index b0a67b7ffdcd..f913c30d7b89 100644
--- a/trunk/include/mtd/mtd-abi.h
+++ b/trunk/include/mtd/mtd-abi.h
@@ -7,12 +7,6 @@
 #ifndef __MTD_ABI_H__
 #define __MTD_ABI_H__
 
-#ifndef __KERNEL__ 
-/* Urgh. The whole point of splitting this out into
-   separate files was to avoid #ifdef __KERNEL__ */
-#define __user
-#endif
-
 struct erase_info_user {
 	uint32_t start;
 	uint32_t length;