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
/
flashchip.h
diff --git
a/include/linux/mtd/flashchip.h
b/include/linux/mtd/flashchip.h
index
c3ac4df
..
7e042bf
100644
(file)
--- a/
include/linux/mtd/flashchip.h
+++ b/
include/linux/mtd/flashchip.h
@@
-6,7
+6,7
@@
*
* (C) 2000 Red Hat. GPLd.
*
*
* (C) 2000 Red Hat. GPLd.
*
- * $Id: flashchip.h,v 1.
14 2004/06/15 16:44:59 nico
Exp $
+ * $Id: flashchip.h,v 1.
9 2003/04/30 11:15:22 dwmw2
Exp $
*
*/
*
*/
@@
-43,8
+43,7
@@
typedef enum {
/* NOTE: confusingly, this can be used to refer to more than one chip at a time,
/* NOTE: confusingly, this can be used to refer to more than one chip at a time,
- if they're interleaved. This can even refer to individual partitions on
- the same physical chip when present. */
+ if they're interleaved. */
struct flchip {
unsigned long start; /* Offset within the map */
struct flchip {
unsigned long start; /* Offset within the map */
@@
-62,7
+61,6
@@
struct flchip {
int write_suspended:1;
int erase_suspended:1;
int write_suspended:1;
int erase_suspended:1;
- unsigned long in_progress_block_addr;
spinlock_t *mutex;
spinlock_t _spinlock; /* We do it like this because sometimes they'll be shared. */
spinlock_t *mutex;
spinlock_t _spinlock; /* We do it like this because sometimes they'll be shared. */
@@
-71,17
+69,8
@@
struct flchip {
int word_write_time;
int buffer_write_time;
int erase_time;
int word_write_time;
int buffer_write_time;
int erase_time;
-
- void *priv;
};
};
-/* This is used to handle contention on write/erase operations
- between partitions of the same physical chip. */
-struct flchip_shared {
- spinlock_t lock;
- struct flchip *writing;
- struct flchip *erasing;
-};
#endif /* __MTD_FLASHCHIP_H__ */
#endif /* __MTD_FLASHCHIP_H__ */