git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
linux
/
mtd
/
mtd.h
diff --git
a/include/linux/mtd/mtd.h
b/include/linux/mtd/mtd.h
index
b3d1343
..
fd7b15d
100644
(file)
--- a/
include/linux/mtd/mtd.h
+++ b/
include/linux/mtd/mtd.h
@@
-1,5
+1,5
@@
/*
/*
- * $Id: mtd.h,v 1.5
6 2004/08/09 18:46:04 dmarlin
Exp $
+ * $Id: mtd.h,v 1.5
4 2004/07/15 01:13:12 dwmw2
Exp $
*
* Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al.
*
*
* Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al.
*
@@
-19,7
+19,6
@@
#include <linux/module.h>
#include <linux/uio.h>
#include <linux/module.h>
#include <linux/uio.h>
-#include <linux/mtd/compatmac.h>
#include <mtd/mtd-abi.h>
#define MTD_CHAR_MAJOR 90
#include <mtd/mtd-abi.h>
#define MTD_CHAR_MAJOR 90
@@
-193,17
+192,6
@@
int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs,
#define MTD_WRITEOOB(mtd, args...) (*(mtd->write_oob))(mtd, args)
#define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0)
#define MTD_WRITEOOB(mtd, args...) (*(mtd->write_oob))(mtd, args)
#define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0)
-
-#ifdef CONFIG_MTD_PARTITIONS
-void mtd_erase_callback(struct erase_info *instr);
-#else
-static inline void mtd_erase_callback(struct erase_info *instr)
-{
- if (instr->callback)
- instr->callback(instr);
-}
-#endif
-
/*
* Debugging macro and defines
*/
/*
* Debugging macro and defines
*/