From: Tony Lindgren <tony@atomide.com>
Date: Wed, 8 Apr 2009 00:05:31 +0000 (-0700)
Subject: Merge branch 'omap-fixes'
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=4311ae5aa39c5cb942afc4d4e2a1a08e8d2b0d04;hp=-c

Merge branch 'omap-fixes'
---

4311ae5aa39c5cb942afc4d4e2a1a08e8d2b0d04
diff --combined drivers/mmc/host/omap_hsmmc.c
index 84554db12e7,d765df29ee1..83fc70972d3
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -298,7 -298,6 +298,6 @@@ mmc_omap_xfer_done(struct mmc_omap_hos
  		struct mmc_request *mrq = host->mrq;
  
  		host->mrq = NULL;
- 		mmc_omap_fclk_lazy_disable(host);
  		mmc_request_done(host->mmc, mrq);
  		return;
  	}
@@@ -1074,6 -1073,7 +1073,6 @@@ static int __init omap_mmc_probe(struc
  	mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
  	mmc->max_seg_size = mmc->max_req_size;
  
 -	mmc->ocr_avail = mmc_slot(host).ocr_mask;
  	mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
  
  	if (pdata->slots[host->slot_id].wires >= 8)
@@@ -1110,14 -1110,13 +1109,14 @@@
  		goto err_irq;
  	}
  
 +	/* initialize power supplies, gpios, etc */
  	if (pdata->init != NULL) {
  		if (pdata->init(&pdev->dev) != 0) {
 -			dev_dbg(mmc_dev(host->mmc),
 -				"Unable to configure MMC IRQs\n");
 +			dev_dbg(mmc_dev(host->mmc), "late init error\n");
  			goto err_irq_cd_init;
  		}
  	}
 +	mmc->ocr_avail = mmc_slot(host).ocr_mask;
  
  	/* Request IRQ for card detect */
  	if ((mmc_slot(host).card_detect_irq)) {