diff options
| author | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-10-20 19:09:03 +0800 |
|---|---|---|
| committer | Zhang Jiejing <jiejing.zhang@freescale.com> | 2011-11-02 11:13:52 +0800 |
| commit | a762c73803259008fc62a3b3f5ec32c86d51c5b7 (patch) | |
| tree | f00c09ec1b1be2a094a39d26fa31f3a206dfa7ac /include | |
| parent | 6e037efc0b6ca27bb8d8525310690e063b1ab885 (diff) | |
ENGR00000001 Revert "mmc: core: Add deferred bus resume policy for android."
This reverts commit 8ac7fbd32b8b72ccfd0511089e4fad2d828d8682.
Conflicts:
drivers/mmc/card/block.c
Revert this commit because this patch changed in android 2.6.35 branch.
I revert this patch and apply the new patch to avoid misunstanding.
Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/host.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 8e613a5c53a7..e77d7541da3c 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -200,10 +200,6 @@ struct mmc_host { const struct mmc_bus_ops *bus_ops; /* current bus driver */ unsigned int bus_refs; /* reference counter */ -#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME - unsigned int need_resume:1; - unsigned int deferred_resume:1; -#endif unsigned int sdio_irqs; struct task_struct *sdio_irq_thread; @@ -236,10 +232,6 @@ static inline void *mmc_priv(struct mmc_host *host) #define mmc_classdev(x) (&(x)->class_dev) #define mmc_hostname(x) (dev_name(&(x)->class_dev)) -#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME -extern int mmc_resume_bus(struct mmc_host *host); -#endif - extern int mmc_suspend_host(struct mmc_host *); extern int mmc_resume_host(struct mmc_host *); |