From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sat, 2 Dec 2006 16:29:04 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc
X-Git-Tag: v3.12-rc1~31383^2~47^2~565
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdb54fac35812a21943f0e506e8e3b94b469a77c;p=kernel%2Fkernel-generic.git

Merge branch 'for-linus' of /linux/kernel/git/drzeus/mmc

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc:
  mmc: correct request error handling
  mmc: Flush block queue when removing card
  mmc: sdhci high speed support
  mmc: Support for high speed SD cards
  mmc: Fix mmc_delay() function
  mmc: Add support for mmc v4 wide-bus modes
  [PATCH] mmc: Add support for mmc v4 high speed mode
  trivial change for mmc/Kconfig: MMC_PXA does not mean only PXA255
  Make general code cleanups
  Add MMC_CAP_{MULTIWRITE,BYTEBLOCK} flags
  Platform device error handling cleanup
  Move register definitions away from the header file
  Change OMAP_MMC_{READ,WRITE} macros to use the host pointer
  Replace base with virt_base and phys_base
  mmc: constify mmc_host_ops vectors
  mmc: remove kernel_thread()
---

cdb54fac35812a21943f0e506e8e3b94b469a77c
diff --cc drivers/mmc/omap.c
index d593ef3,f8830c5..435d331
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@@ -640,9 -685,10 +685,9 @@@ mmc_omap_prepare_dma(struct mmc_omap_ho
  	}
  
  	/* Max limit for DMA frame count is 0xffff */
 -	if (unlikely(count > 0xffff))
 -		BUG();
 +	BUG_ON(count > 0xffff);
  
- 	OMAP_MMC_WRITE(host->base, BUF, buf);
+ 	OMAP_MMC_WRITE(host, BUF, buf);
  	omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16,
  				     frame, count, OMAP_DMA_SYNC_FRAME,
  				     sync_dev, 0);