diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /include/linux/mmc/mmc.h | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/mmc/mmc.h')
| -rw-r--r-- | include/linux/mmc/mmc.h | 2 |
1 files changed, 2 insertions, 0 deletions
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); | |||
| 105 | extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int, | 105 | extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int, |
| 106 | struct mmc_command *, int); | 106 | struct mmc_command *, int); |
| 107 | 107 | ||
| 108 | extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int); | ||
| 109 | |||
| 108 | extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card); | 110 | extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card); |
| 109 | 111 | ||
| 110 | static inline void mmc_claim_host(struct mmc_host *host) | 112 | static inline void mmc_claim_host(struct mmc_host *host) |