[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>

diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index e1da2a5b2a576352f6bbed7f8442e2dbbfc1cbec..f2f210fc1ef2b49663b01a9c960d5b24f8863b4d 100644 (file)
--- 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 b0a67b7ffdcd2697b1b281c4b3ff1c1733214216..f913c30d7b8976754e4c0008eb5c2db8eca44e08 100644 (file)
--- 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;