summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-19 16:42:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-19 16:42:25 -0700
commitae83e255045ed3cdc798664e8e189aa5cf2702eb (patch)
tree88e58ea54439131fa3ee9730575f55aaf4b80b95 /include
parent890f74291c9133eaed6c0eb8514f7618d43d0925 (diff)
parent2c171bf13423dc5293188cea7f6c2da1720926e2 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [ARM] 3531/1: i.MX/MX1 SD/MMC ensure, that clock are stopped before new command and cleanups
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmc/mmc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index bdc556d88498..03a14a30c46a 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -69,6 +69,7 @@ struct mmc_data {
unsigned int timeout_ns; /* data timeout (in ns, max 80ms) */
unsigned int timeout_clks; /* data timeout (in clocks) */
unsigned int blksz_bits; /* data block size */
+ unsigned int blksz; /* data block size */
unsigned int blocks; /* number of blocks */
unsigned int error; /* data error */
unsigned int flags;