From: Paul Walmsley <paul@pwsan.com>
Date: Mon, 11 Aug 2008 17:38:21 +0000 (-0600)
Subject: HSMMC: Fix omap_hsmmc.c compilation
X-Git-Tag: v2.6.27-omap1~324
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a495d02f81cb8f21e9a96ed8c21d9a86194ed13a;p=linux-2.6-omap-h63xx.git

HSMMC: Fix omap_hsmmc.c compilation

Fix asm/semaphore.h to be linux/semaphore.h; also remove
MMC_CAP_MULTIWRITE per 23af60398af2f5033e2f53665538a09f498dbc03.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: <madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 1ff51b7060f..7a6586f9507 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -26,7 +26,7 @@
 #include <linux/clk.h>
 #include <linux/mmc/host.h>
 #include <linux/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/dma.h>
 #include <asm/hardware.h>
 #include <asm/arch/board.h>
@@ -810,8 +810,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 	mmc->max_seg_size = mmc->max_req_size;
 
 	mmc->ocr_avail = mmc_slot(host).ocr_mask;
-	mmc->caps |= MMC_CAP_MULTIWRITE | MMC_CAP_MMC_HIGHSPEED |
-				MMC_CAP_SD_HIGHSPEED;
+	mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
 
 	if (pdata->conf.wire4)
 		mmc->caps |= MMC_CAP_4_BIT_DATA;