From 6fdbf11a2490df515090c26421ff04c35e3a6541 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 25 Sep 2006 21:52:21 +0100
Subject: [PATCH] --- yaml --- r: 37919 b: refs/heads/master c:
 9663265626fd683faa3f7a994bb6db073581807e h: refs/heads/master i:   37917:
 32bfa75c9887d3cbc8f7aa3a88a4385377874d8e   37915:
 850be2cc69b43e60cbc5592f9f78c53f8a62928d   37911:
 76122ded1cf853e9a9d99dcfc697217674af1f74   37903:
 b942be7b5d8acf43f3cff6dbde66f4b8cb1191ef   37887:
 5cb91664a665da84e37cab5a5f398716d8c901a9 v: v3

---
 [refs]                      | 2 +-
 trunk/include/mtd/Kbuild    | 3 +--
 trunk/include/mtd/mtd-abi.h | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)

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;