Fix asm/semaphore.h to be linux/semaphore.h; also remove
MMC_CAP_MULTIWRITE per 23af60398af2f5033e2f53665538a09f498dbc03.
Signed-off-by: Paul Walmsley <[EMAIL PROTECTED]>
Cc: <[EMAIL PROTECTED]>
---
drivers/mmc/host/omap_hsmmc.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 1ff51b7..7a6586f 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
