diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:28:21 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:28:21 -0500 |
| commit | ebc62fb36ca40539fb08575f94c7da75d1b9db85 (patch) | |
| tree | b1fa10bf3a02893506fc296d90631a73b215102a /include/linux | |
| parent | 418fbfe979d96efc7b91f29b2085d51541c61f0b (diff) | |
| parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
| download | op-kernel-dev-ebc62fb36ca40539fb08575f94c7da75d1b9db85.zip op-kernel-dev-ebc62fb36ca40539fb08575f94c7da75d1b9db85.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/onenand.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h index f1fd421..7419b5f 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h @@ -17,7 +17,6 @@ #include <linux/mtd/bbm.h> #define MAX_BUFFERRAM 2 -#define MAX_ONENAND_PAGESIZE (2048 + 64) /* Scan and identify a OneNAND device */ extern int onenand_scan(struct mtd_info *mtd, int max_chips); @@ -110,6 +109,7 @@ struct onenand_chip { spinlock_t chip_lock; wait_queue_head_t wq; onenand_state_t state; + unsigned char *page_buf; struct nand_oobinfo *autooob; @@ -134,13 +134,12 @@ struct onenand_chip { * Options bits */ #define ONENAND_CONT_LOCK (0x0001) - +#define ONENAND_PAGEBUF_ALLOC (0x1000) /* * OneNAND Flash Manufacturer ID Codes */ #define ONENAND_MFR_SAMSUNG 0xec -#define ONENAND_MFR_UNKNOWN 0x00 /** * struct nand_manufacturers - NAND Flash Manufacturer ID Structure |
