diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/linux/mtd/flashchip.h | |
parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
download | kernel-crypto-7b3b6e42032e94a6132a85642e95106f5346650e.tar.gz kernel-crypto-7b3b6e42032e94a6132a85642e95106f5346650e.tar.xz kernel-crypto-7b3b6e42032e94a6132a85642e95106f5346650e.zip |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/linux/mtd/flashchip.h')
-rw-r--r-- | include/linux/mtd/flashchip.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index 08dd131301c..d4f38c5fd44 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -73,6 +73,10 @@ struct flchip { int buffer_write_time; int erase_time; + int word_write_time_max; + int buffer_write_time_max; + int erase_time_max; + void *priv; }; |