diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/mmc/host/omap.c | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'drivers/mmc/host/omap.c')
| -rw-r--r-- | drivers/mmc/host/omap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 2b281680e320..d98ddcfac5e5 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
| @@ -1157,7 +1157,6 @@ static void mmc_omap_start_request(struct mmc_omap_host *host, | |||
| 1157 | mmc_omap_start_command(host, req->cmd); | 1157 | mmc_omap_start_command(host, req->cmd); |
| 1158 | if (host->dma_in_use) | 1158 | if (host->dma_in_use) |
| 1159 | omap_start_dma(host->dma_ch); | 1159 | omap_start_dma(host->dma_ch); |
| 1160 | BUG_ON(irqs_disabled()); | ||
| 1161 | } | 1160 | } |
| 1162 | 1161 | ||
| 1163 | static void mmc_omap_request(struct mmc_host *mmc, struct mmc_request *req) | 1162 | static void mmc_omap_request(struct mmc_host *mmc, struct mmc_request *req) |