[MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>

[Linux-MTD Mailing List]

Commit:     9663265626fd683faa3f7a994bb6db073581807e
Parent:     956e944c7690ea994757a8cbedbb6241e1d9138f
commit 9663265626fd683faa3f7a994bb6db073581807e
Author:     David Woodhouse <dwmw2 at infradead.org>
AuthorDate: Mon Sep 25 21:52:21 2006 +0100
Commit:     David Woodhouse <dwmw2 at infradead.org>
CommitDate: Mon Sep 25 21:52:21 2006 +0100

    [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 at infradead.org>
---
 include/mtd/Kbuild    |    3 +--
 include/mtd/mtd-abi.h |    6 ------
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index e1da2a5..f2f210f 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 b0a67b7..f913c30 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;