projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[platform/kernel/u-boot.git]
/
include
/
linux
/
mtd
/
nand_legacy.h
diff --git
a/include/linux/mtd/nand_legacy.h
b/include/linux/mtd/nand_legacy.h
index
b05e726
..
99eafbb
100644
(file)
--- a/
include/linux/mtd/nand_legacy.h
+++ b/
include/linux/mtd/nand_legacy.h
@@
-36,7
+36,7
@@
#ifndef __LINUX_MTD_NAND_LEGACY_H
#define __LINUX_MTD_NAND_LEGACY_H
#ifndef __LINUX_MTD_NAND_LEGACY_H
#define __LINUX_MTD_NAND_LEGACY_H
-#ifndef C
F
G_NAND_LEGACY
+#ifndef C
ONFI
G_NAND_LEGACY
#error This module is for the legacy NAND support
#endif
#error This module is for the legacy NAND support
#endif
@@
-55,18
+55,6
@@
#define NAND_CMD_RESET 0xff
/*
#define NAND_CMD_RESET 0xff
/*
- * Enumeration for NAND flash chip state
- */
-typedef enum {
- FL_READY,
- FL_READING,
- FL_WRITING,
- FL_ERASING,
- FL_SYNCING
-} nand_state_t;
-
-
-/*
* NAND Private Flash Chip Data
*
* Structure overview:
* NAND Private Flash Chip Data
*
* Structure overview: