public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
* + arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch added to -mm tree
@ 2010-08-27 20:03 akpm
  2010-08-27 20:23 ` Matt Fleming
  0 siblings, 1 reply; 3+ messages in thread
From: akpm @ 2010-08-27 20:03 UTC (permalink / raw)
  To: mm-commits; +Cc: jiri.pinkava, cjb, linux-mmc, matt, rmk


The patch titled
     ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected
has been added to the -mm tree.  Its filename is
     arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected
From: Jiri Pinkava <jiri.pinkava@vscht.cz>

Date: Tue, 25 May 2010 09:48:58 +0200

[cjb: fix line-wrapped patch]
Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
Signed-off-by: Chris Ball <cjb@laptop.org>
Cc: Matt Fleming <matt@console-pimps.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mmc/host/s3cmci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/mmc/host/s3cmci.c~arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected drivers/mmc/host/s3cmci.c
--- a/drivers/mmc/host/s3cmci.c~arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected
+++ a/drivers/mmc/host/s3cmci.c
@@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct
 	host->pio_active 	= XFER_NONE;
 
 #ifdef CONFIG_MMC_S3C_PIODMA
-	host->dodma		= host->pdata->dma;
+	host->dodma		= host->pdata->use_dma;
 #endif
 
 	host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
_

Patches currently in -mm which might be from jiri.pinkava@vscht.cz are

arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: + arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch added to -mm tree
  2010-08-27 20:03 + arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch added to -mm tree akpm
@ 2010-08-27 20:23 ` Matt Fleming
  2010-09-05 20:20   ` Matt Fleming
  0 siblings, 1 reply; 3+ messages in thread
From: Matt Fleming @ 2010-08-27 20:23 UTC (permalink / raw)
  To: akpm; +Cc: mm-commits, jiri.pinkava, cjb, linux-mmc, rmk, Ben Dooks

Best get Ben's opinion on this (now Cc'd).

On Fri, Aug 27, 2010 at 01:03:39PM -0700, Andrew Morton wrote:
> 
> The patch titled
>      ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected
> has been added to the -mm tree.  Its filename is
>      arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch
> 
> Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
> 
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
> 
> See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
> out what to do about this
> 
> The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
> 
> ------------------------------------------------------
> Subject: ARM: SAMSUNG: MMC: fix build error when both DMA and PIO mode selected
> From: Jiri Pinkava <jiri.pinkava@vscht.cz>
> 
> Date: Tue, 25 May 2010 09:48:58 +0200
> 
> [cjb: fix line-wrapped patch]
> Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
> Signed-off-by: Chris Ball <cjb@laptop.org>
> Cc: Matt Fleming <matt@console-pimps.org>
> Cc: Russell King <rmk@arm.linux.org.uk>
> Cc: <linux-mmc@vger.kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/mmc/host/s3cmci.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN drivers/mmc/host/s3cmci.c~arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected drivers/mmc/host/s3cmci.c
> --- a/drivers/mmc/host/s3cmci.c~arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected
> +++ a/drivers/mmc/host/s3cmci.c
> @@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct
>  	host->pio_active 	= XFER_NONE;
>  
>  #ifdef CONFIG_MMC_S3C_PIODMA
> -	host->dodma		= host->pdata->dma;
> +	host->dodma		= host->pdata->use_dma;
>  #endif
>  
>  	host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> _
> 
> Patches currently in -mm which might be from jiri.pinkava@vscht.cz are
> 
> arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: + arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch added to -mm tree
  2010-08-27 20:23 ` Matt Fleming
@ 2010-09-05 20:20   ` Matt Fleming
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Fleming @ 2010-09-05 20:20 UTC (permalink / raw)
  To: akpm; +Cc: mm-commits, jiri.pinkava, cjb, linux-mmc, rmk, Ben Dooks

On Fri, Aug 27, 2010 at 09:23:47PM +0100, Matt Fleming wrote:
> Best get Ben's opinion on this (now Cc'd).

OK, it's been over a week and Ben hasn't replied. This fixes a build
error so shouldn't wait any longer.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-09-05 20:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-27 20:03 + arm-samsung-mmc-fix-build-error-when-both-dma-and-pio-mode-selected.patch added to -mm tree akpm
2010-08-27 20:23 ` Matt Fleming
2010-09-05 20:20   ` Matt Fleming

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox