diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-14 11:26:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-14 11:26:22 +0200 |
| commit | 28ac6719108e989429de2b3dfa90312ba7c4d27b (patch) | |
| tree | 876a26cd366f7bd80b88f02d6bf5b149f385dfa1 /include/linux/mtd/nand.h | |
| parent | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (diff) | |
| parent | 68cf19aae48f2969ec70669604d0d776f02c8bc4 (diff) | |
| download | u-boot-imx-28ac6719108e989429de2b3dfa90312ba7c4d27b.zip u-boot-imx-28ac6719108e989429de2b3dfa90312ba7c4d27b.tar.gz u-boot-imx-28ac6719108e989429de2b3dfa90312ba7c4d27b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/linux/mtd/nand.h')
| -rw-r--r-- | include/linux/mtd/nand.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 2993a89..7ac72de 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -213,20 +213,6 @@ typedef enum { #define NAND_CI_CHIPNR_MSK 0x03 #define NAND_CI_CELLTYPE_MSK 0x0C -/* - * nand_state_t - chip states - * Enumeration for NAND flash chip state - */ -typedef enum { - FL_READY, - FL_READING, - FL_WRITING, - FL_ERASING, - FL_SYNCING, - FL_CACHEDPRG, - FL_PM_SUSPENDED, -} nand_state_t; - /* Keep gcc happy */ struct nand_chip; @@ -416,7 +402,7 @@ struct nand_chip { uint8_t cellinfo; int badblockpos; - nand_state_t state; + int state; uint8_t *oob_poi; struct nand_hw_control *controller; |