* [PATCH] HSMMC: Fix omap_hsmmc.c compilation
@ 2008-08-11 17:38 Paul Walmsley
2008-08-12 11:04 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Paul Walmsley @ 2008-08-11 17:38 UTC (permalink / raw)
To: linux-omap; +Cc: madhu.cr
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>
---
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] HSMMC: Fix omap_hsmmc.c compilation
2008-08-11 17:38 [PATCH] HSMMC: Fix omap_hsmmc.c compilation Paul Walmsley
@ 2008-08-12 11:04 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2008-08-12 11:04 UTC (permalink / raw)
To: Paul Walmsley; +Cc: linux-omap, madhu.cr
* Paul Walmsley <paul@pwsan.com> [080811 20:39]:
>
> Fix asm/semaphore.h to be linux/semaphore.h; also remove
> MMC_CAP_MULTIWRITE per 23af60398af2f5033e2f53665538a09f498dbc03.
Pushing today.
Tony
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: <madhu.cr@ti.com>
>
> ---
>
> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-12 11:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-11 17:38 [PATCH] HSMMC: Fix omap_hsmmc.c compilation Paul Walmsley
2008-08-12 11:04 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox