summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-25 21:52:21 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-09-25 21:52:21 +0100
commit9663265626fd683faa3f7a994bb6db073581807e (patch)
tree9e74398508e72dbe3c7181c0348f00eaa15b8f49
parent956e944c7690ea994757a8cbedbb6241e1d9138f (diff)
downloadlinux-9663265626fd683faa3f7a994bb6db073581807e.tar.bz2
[MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>
Now that we have headers_install, we don't need this crap. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--include/mtd/Kbuild3
-rw-r--r--include/mtd/mtd-abi.h6
2 files changed, 1 insertions, 8 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index e1da2a5b2a57..f2f210fc1ef2 100644
--- a/include/mtd/Kbuild
+++ b/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/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index b0a67b7ffdcd..f913c30d7b89 100644
--- a/include/mtd/mtd-abi.h
+++ b/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;