diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:22:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:22:17 -0700 |
| commit | 3e04767a4647ea6c61ed05abe803c052ce123960 (patch) | |
| tree | 431d98caf56d9a14585e4358f184745dafbd6405 /include/mtd | |
| parent | a12f66fccf2e266ad197df142b5ebafc6a169a8c (diff) | |
| parent | 76a5027c374a638e55de5d8c4485ea0201254870 (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[MTD] Cleanup of 'ioremap balanced with iounmap for drivers/mtd subsystem'
[MTD] fix nftl_write warning
[MTD] fix printk warning
[MTD ONENAND] Check OneNAND lock scheme & all block unlock command support
[MTD ONENAND] Remove unused MTD_ONENAND_SYNC_READ configuration
[MTD ONENAND] Fix OneNAND probe
[MTD NAND] Provide prototype for newly-exported nand_wait_ready()
[MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>
[MTD NAND] Allow override of page read and write functions.
[MTD NAND] Allocate chip->buffers separately to allow it to be overridden
[MTD NAND] Split nand_scan() into two parts; allow board driver to intervene
[MTD NAND] Export nand_wait_ready() for use by board drivers
Diffstat (limited to 'include/mtd')
| -rw-r--r-- | include/mtd/Kbuild | 3 | ||||
| -rw-r--r-- | include/mtd/mtd-abi.h | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild index 13e7a3c6d79..e0fe92b03a4 100644 --- a/include/mtd/Kbuild +++ b/include/mtd/Kbuild @@ -1,6 +1,5 @@ header-y += inftl-user.h header-y += jffs2-user.h +header-y += mtd-abi.h header-y += mtd-user.h header-y += nftl-user.h - -unifdef-y += mtd-abi.h diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h index b0a67b7ffdc..f913c30d7b8 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; |