summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 07:56:38 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 07:56:38 -0700
commite004876c3b0b6a71406069b0e55368cb9bbdc920 (patch)
tree43f95e14b282cbc683ec66539de25e0e94649f65 /include/linux
parent5a05e5bf204e729b79e9462785f2fa09d5126855 (diff)
parent6fe9febb8af2f82f9caace1aa1c00cd8de7469ac (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Always use a sector size of 512 bytes [MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246 [ARM] 3751/1: i.MX/MX1 SD/MMC use 512 bytes request for SCR read [MMC] Fix SD timeout calculation [MMC] constify mmc_host_ops
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mmc/host.h2
-rw-r--r--include/linux/mmc/mmc.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index c1f021eddffa..ba095aebedff 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -77,7 +77,7 @@ struct mmc_host {
struct device *dev;
struct class_device class_dev;
int index;
- struct mmc_host_ops *ops;
+ const struct mmc_host_ops *ops;
unsigned int f_min;
unsigned int f_max;
u32 ocr_avail;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 03a14a30c46a..627e2c08ce41 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -105,6 +105,8 @@ extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int,
struct mmc_command *, int);
+extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int);
+
extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card);
static inline void mmc_claim_host(struct mmc_host *host)