]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
HSMMC: Fix omap_hsmmc.c compilation
authorPaul Walmsley <paul@pwsan.com>
Mon, 11 Aug 2008 17:38:21 +0000 (11:38 -0600)
committerTony Lindgren <tony@atomide.com>
Tue, 12 Aug 2008 11:03:43 +0000 (14:03 +0300)
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>
drivers/mmc/host/omap_hsmmc.c

index 1ff51b7060f646919c7b188e68efc32d6b24a76d..7a6586f95076b9fbf953ffb3315e227e3ba38e6d 100644 (file)
@@ -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;